diff options
| author | Gerald Carter <jerry@samba.org> | 2006-05-24 15:34:18 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-05-24 15:34:18 +0000 |
| commit | a1b3f2f9bac039395fa20f0be779367f7e23400a (patch) | |
| tree | 0b6725492b7f5fe6289fb2c83b21655e92f9c9da | |
| parent | f83b22a4ac79ceb6c558a88e7f5344d100806c2b (diff) | |
| download | samba-a1b3f2f9bac039395fa20f0be779367f7e23400a.tar.gz samba-a1b3f2f9bac039395fa20f0be779367f7e23400a.tar.xz samba-a1b3f2f9bac039395fa20f0be779367f7e23400a.zip | |
r15866: merge build fixes for HP-UX 11.11 and IRIX 6.4samba-3.0.23rc1
| -rw-r--r-- | source/include/includes.h | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index a74ca7084d5..e6358f5abb4 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -30,7 +30,11 @@ #include "config.h" #endif -#ifndef __cplusplus +/* only do the C++ reserved word check when we compile + to include --with-developer since too many systems + still have comflicts with their header files (e.g. IRIX 6.4) */ + +#if !defined(__cplusplus) && defined(DEVELOPER) #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES @@ -596,11 +600,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 +623,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 /* |