From 2805b943d848831bb601abe9b4ffb2c7ef514766 Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 23 Apr 2002 12:59:51 +0000 Subject: [PATCH] - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes. Reported by Doug Manton --- ChangeLog | 2 ++ defines.h | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c3c8a1f..dcd59716 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Antti Tapaninen - (djm) Define BROKEN_REALPATH for AIX, patch from Antti Tapaninen + - (djm) Bug #213: Simplify CMSG_ALIGN macros to avoid symbol clashes. + Reported by Doug Manton - (djm) Bug #222: Fix tests for getaddrinfo on OSF/1. Spotted by Robert Urban - (djm) Make privsep work with PAM (still experimental) diff --git a/defines.h b/defines.h index 3f2b8de5..a5d62a81 100644 --- 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 */ -- 2.45.2