2 files changed, 7 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e78fd929f..1eb83eff0 100644
--- 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)
@@ -480,4 +482,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2074 2002/04/23 12:52:45 djm Exp $
+$Id: ChangeLog,v 1.2075 2002/04/23 12:59:51 djm Exp $
diff --git a/defines.h b/defines.h
index c6b08c403..f74ca0d82 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.87 2002/04/23 10:23:00 djm Exp $ */
+/* $Id: defines.h,v 1.88 2002/04/23 12:59:51 djm Exp $ */
 
 
 /* Constants */
@@ -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 */