svn commit: samba r15866 - in
branches/SAMBA_3_0_RELEASE/source/include: .
jerry at samba.org
jerry at samba.org
Wed May 24 15:34:18 GMT 2006
Author: jerry
Date: 2006-05-24 15:34:18 +0000 (Wed, 24 May 2006)
New Revision: 15866
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15866
Log:
merge build fixes for HP-UX 11.11 and IRIX 6.4
Modified:
branches/SAMBA_3_0_RELEASE/source/include/includes.h
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/include/includes.h 2006-05-24 14:45:07 UTC (rev 15865)
+++ branches/SAMBA_3_0_RELEASE/source/include/includes.h 2006-05-24 15:34:18 UTC (rev 15866)
@@ -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 @@
#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,17 +623,19 @@
#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
+# 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
-#endif
/*
* Note we duplicate the size tests in the unsigned
More information about the samba-cvs
mailing list