diff options
| author | Matt Kraai <mkraai@beckman.com> | 2009-07-01 10:49:35 -0700 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2009-07-03 11:50:53 +0200 |
| commit | dcf03b9d431bf5733bde76143da7405650ba119a (patch) | |
| tree | 1f3380878ddee772ffdfc0161680279d39158c46 | |
| parent | 0b06aa23049f49b985432c6b18c8a888a079eca1 (diff) | |
| download | samba-dcf03b9d431bf5733bde76143da7405650ba119a.tar.gz samba-dcf03b9d431bf5733bde76143da7405650ba119a.tar.bz2 samba-dcf03b9d431bf5733bde76143da7405650ba119a.zip | |
do not redefine _INT32
| -rw-r--r-- | source3/include/includes.h | 6 | ||||
| -rw-r--r-- | source3/libaddns/dns.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index c1aeaf95b5..2b36d18257 100644 --- 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 a04a13bfd9..72cba076d8 100644 --- 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 /* |