summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-05-24 14:26:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:11 -0500
commit5b558868551076cd03de4c634ce9fe74e46060df (patch)
treeb1eccc209ab71441dcc49a9dd75e5fe2eca6da6c
parent90a6873b0570f2691ba8d8fd11154c856bdd4415 (diff)
downloadsamba-5b558868551076cd03de4c634ce9fe74e46060df.tar.gz
samba-5b558868551076cd03de4c634ce9fe74e46060df.tar.bz2
samba-5b558868551076cd03de4c634ce9fe74e46060df.zip
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
(This used to be commit 094443ed6c0fdd06f459211dbca50feed58463ef)
-rw-r--r--source3/include/includes.h34
1 files changed, 19 insertions, 15 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a74ca7084d..b9267a7d83 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -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
/*