Attachment 13082 Details for Bug 12559 – git-am fix for 4.6.next, 4.5.next.

[patch] git-am fix for 4.6.next, 4.5.next.

0001-Fix-for-Solaris-C-compiler.patch (text/plain), 1.17 KB, created by Jeremy Allison on 2017-03-17 20:04:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-03-17 20:04:55 UTC

Size: 1.17 KB

patch

obsolete

>From adb76864702ee7d525cc9e82667a9d57b2ecd5e4 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 16 Mar 2017 09:10:52 -0700
>Subject: [PATCH 2/2] Fix for Solaris C compiler.
>
>Inspired by comment 4 in bug 12559.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12559
>
>Signed-off-by: Tom Schulz <schulz@adi.com>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(cherry picked from commit 59229276bcf5e2b7fa0ddf3ceb6fd3adccc01f9a)
>---
> source3/include/tldap.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/source3/include/tldap.h b/source3/include/tldap.h
>index 74279a4ba18..23e3f1b655b 100644
>--- a/source3/include/tldap.h
>+++ b/source3/include/tldap.h
>@@ -47,9 +47,15 @@ struct tldap_mod {
> 	DATA_BLOB *values;
> };
> 
>+#if defined(HAVE_IMMEDIATE_STRUCTURES)
> typedef struct { uint8_t rc; } TLDAPRC;
> #define TLDAP_RC(x) ((TLDAPRC){.rc = x})
> #define TLDAP_RC_V(x) ((x).rc)
>+#else
>+typedef uint8_t TLDAPRC;
>+#define TLDAP_RC(x) (x)
>+#define TLDAP_RC_V(x) (x)
>+#endif
> 
> #define TLDAP_RC_EQUAL(x,y) (TLDAP_RC_V(x)==TLDAP_RC_V(y))
> #define TLDAP_RC_IS_SUCCESS(x) TLDAP_RC_EQUAL(x,TLDAP_SUCCESS)
>-- 
>2.12.0.367.g23dc2f6d3c-goog
>

Flags:

martins: review+

Actions: View

Attachments on bug 12559: 13064 | 13082