- (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes.

   Reported by Doug Manton <dmanton@emea.att.com>

diff --git a/ChangeLog b/ChangeLog
index 3c3c8a1f23e83c3c2b1c78bc53c7e486d2846801..dcd5971640beeb4de0cde0c9865a0f04354ce87e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    Antti Tapaninen <aet@cc.hut.fi>
  - (djm) Define BROKEN_REALPATH for AIX, patch from 
    Antti Tapaninen <aet@cc.hut.fi>
+ - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes. 
+   Reported by Doug Manton <dmanton@emea.att.com>
  - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by
    Robert Urban <urban@spielwiese.de>
  - (djm) Make privsep work with PAM (still experimental)

diff --git a/defines.h b/defines.h
index 3f2b8de51c4f2aa8784985ccfc228bd9719a6452..a5d62a81dcf6eb1b47957a8fda319397c5ca5ca9 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -393,14 +393,11 @@ struct winsize {
 # define howmany(x,y)  (((x)+((y)-1))/(y))
 #endif
 
-#ifndef ALIGNBYTES
-#define ALIGNBYTES     (sizeof(int) - 1)
-#endif
-#ifndef ALIGN
-#define ALIGN(p)       (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
+#ifndef OSSH_ALIGNBYTES
+#define OSSH_ALIGNBYTES        (sizeof(int) - 1)
 #endif
 #ifndef __CMSG_ALIGN
-#define        __CMSG_ALIGN(len)       ALIGN(len)
+#define        __CMSG_ALIGN(p) (((u_int)(p) + OSSH_ALIGNBYTES) &~ OSSH_ALIGNBYTES)
 #endif
 
 /* Length of the contents of a control message of length len */