do not redefine _INT32

diff --git a/source3/include/includes.h b/source3/include/includes.h
index c1aeaf95b5dabdb7631174f5b6a42d72d5364726..2b36d18257df548129d8b403d49ef69afad02387 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -313,8 +313,10 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
 
 #if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H)
 #  define int32 int32_t
-   /* needed to work around compile issue on HP-UX 11.x */
-#  define _INT32       1
+#  ifndef _INT32
+     /* needed to work around compile issue on HP-UX 11.x */
+#    define _INT32     1
+#  endif
 #endif
 
 /*

diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index a04a13bfd96a7027257970b2368555f8a1575ce4..72cba076d81a0eb43b846772935e1ab120f6be17 100644 (file)
--- a/source3/libaddns/dns.h
+++ b/source3/libaddns/dns.h
@@ -180,8 +180,10 @@ void *talloc_zeronull(const void *context, size_t size, const char *name);
      /* 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
+#  ifndef _INT32
+     /* needed to work around compile issue on HP-UX 11.x */
+#    define _INT32        1
+#  endif
 #endif
 
 /*