Attachment 4386 Details for Bug 4960 – Patch to not redefine _INT32

[patch] Patch to not redefine _INT32

0001-do-not-redefine-_INT32.patch (text/plain), 1.42 KB, created by Matt Kraai (mail address dead) on 2009-07-01 14:42:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Kraai (mail address dead)

Created: 2009-07-01 14:42:25 UTC

Size: 1.42 KB

patch

obsolete

>From 4766caf5a7df506f1ee6ddc0cc46b657f7f1e840 Mon Sep 17 00:00:00 2001
>From: Matt Kraai <mkraai@beckman.com>
>Date: Wed, 1 Jul 2009 10:49:35 -0700
>Subject: [PATCH] do not redefine _INT32
>
>---
> source3/include/includes.h |    6 ++++--
> 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 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
> 
> /*
>-- 
>1.6.3.2.1299.gee46c
>

Flags:

metze: review+

Actions: View

Attachments on bug 4960: 2920 | 4366 | 4385 | 4386 | 4387 | 4596 | 4599 | 4662