mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-24 10:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reported by Doug Manton <dmanton@emea.att.com>
This commit is contained in:
Damien Miller 2002-04-23 22:59:51 +10:00
parent f5fea44ae3
commit d77facda1a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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 $

11
defines.h
View File

@ -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 */