sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r15863: trying to fix a compile issue on HP-UX 11.x caused by conflicts of int16 and int32 definitions in internal and system headers

Browse Source 
(This used to be commit 094443ed6c)
This commit is contained in:
Gerald Carter 2006-05-24 14:26:34 +00:00 committed by Gerald (Jerry) Carter
parent 90a6873b05
commit 5b55886855
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/include/includes.h
View File

@ -596,11 +596,13 @@ typedef int socklen_t;
#endif
#if !defined(int16) && !defined(HAVE_INT16_FROM_RPC_RPC_H)
#if (SIZEOF_SHORT == 4)
#define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16;
#else /* SIZEOF_SHORT != 4 */
#define int16 short
#endif /* SIZEOF_SHORT != 4 */
# if (SIZEOF_SHORT == 4)
# define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16;
# else /* SIZEOF_SHORT != 4 */
# define int16 short
# endif /* SIZEOF_SHORT != 4 */
/* needed to work around compile issue on HP-UX 11.x */
# define _INT16 1
#endif
/*
@ -617,16 +619,18 @@ typedef int socklen_t;
#endif
#if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H)
#if (SIZEOF_INT == 4)
#define int32 int
#elif (SIZEOF_LONG == 4)
#define int32 long
#elif (SIZEOF_SHORT == 4)
#define int32 short
#else
/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
#define int32 int
#endif
# if (SIZEOF_INT == 4)
# define int32 int
# elif (SIZEOF_LONG == 4)
# define int32 long
# elif (SIZEOF_SHORT == 4)
# define int32 short
# else
/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
# define int32 int
# endif
/* needed to work around compile issue on HP-UX 11.x */
# define _INT32 1
#endif
/*