The branch, master has been updated via dcf03b9d431bf5733bde76143da7405650ba119a (commit) from 0b06aa23049f49b985432c6b18c8a888a079eca1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit dcf03b9d431bf5733bde76143da7405650ba119a Author: Matt Kraai <mkr...@beckman.com> Date: Wed Jul 1 10:49:35 2009 -0700 do not redefine _INT32 ----------------------------------------------------------------------- Summary of changes: source3/include/includes.h | 6 ++++-- source3/libaddns/dns.h | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index c1aeaf9..2b36d18 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 a04a13b..72cba07 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 /* -- Samba Shared Repository