[SCM] Samba Shared Repository - branch master updated
Gary Lockyer
gary at samba.org
Sun Dec 16 23:11:04 UTC 2018
The branch, master has been updated
via 8a313bbdd5c lib:tsocket: Check for DOXYGEN as a #define
via 3da98cb1911 s3:lib: Fix checking for config.h #define in system.c
via 2f6ed306ff4 s3: Fix checking for config.h #define in includes.h
via 7ea82eaca09 nsswitch: Fix checking for config.h #define in winbind_nss.h
via 648e70ba7bf nsswitch: Fix checking for config.h #define in nsstest.h
via 20d279fc161 krb5_samba: Fix checking for config.h #define in krb5_samba.h
via 9005943a12d lib:util: Fix checking for config.h #define in fault.c
via 80c4bc35a5c replace: Fix checking for config.h #define in replace.h
via dd048f91704 replace: Fix checking for config.h #define in gssapi.h
via b0cabfd265c replace: Fix checking for config.h #define in readline.h
from 8cdfc7bbbde travis-ci: Remove hooks for Travis CI (typically used with GitHub)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8a313bbdd5c5e3ec2410387cb4fe528071c60149
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:54:26 2018 +0100
lib:tsocket: Check for DOXYGEN as a #define
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Gary Lockyer <gary at samba.org>
Autobuild-Date(master): Mon Dec 17 00:10:10 CET 2018 on sn-devel-144
commit 3da98cb19112fe98612035792f68fead8c2d6ec5
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:52:45 2018 +0100
s3:lib: Fix checking for config.h #define in system.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 2f6ed306ff4068da8f348c0dbc9ae8abd5850428
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:52:11 2018 +0100
s3: Fix checking for config.h #define in includes.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 7ea82eaca092e2f9aafef7c35227b7d1d35f9afe
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:51:18 2018 +0100
nsswitch: Fix checking for config.h #define in winbind_nss.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 648e70ba7bf891421299bb7e2b8a20f2e9769b97
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:49:32 2018 +0100
nsswitch: Fix checking for config.h #define in nsstest.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 20d279fc161bd2e1a0bdaec613e139df9b6b6590
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:48:44 2018 +0100
krb5_samba: Fix checking for config.h #define in krb5_samba.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 9005943a12dae8e32fed5269331eb5580388aa02
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:48:03 2018 +0100
lib:util: Fix checking for config.h #define in fault.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 80c4bc35a5cfbab173e93f833b620b7d855d78e2
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:47:16 2018 +0100
replace: Fix checking for config.h #define in replace.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit dd048f917040d5b6e42b93e67b944c073f9db949
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:46:38 2018 +0100
replace: Fix checking for config.h #define in gssapi.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit b0cabfd265c475c2726dfc7d7cfb22050bb21f5e
Author: Andreas Schneider <asn at samba.org>
Date: Thu Dec 13 18:45:14 2018 +0100
replace: Fix checking for config.h #define in readline.h
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
lib/krb5_wrap/krb5_samba.h | 2 +-
lib/replace/replace.h | 2 +-
lib/replace/system/gssapi.h | 8 ++++----
lib/replace/system/readline.h | 2 +-
lib/tsocket/tsocket.h | 2 +-
lib/util/fault.c | 2 +-
nsswitch/nsstest.h | 4 ++--
nsswitch/winbind_nss.h | 4 ++--
source3/include/includes.h | 2 +-
source3/lib/system.c | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 4d0148fd047..ebbcba96c08 100644
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -105,7 +105,7 @@ typedef struct {
#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY /* MIT */
#define KRB5_KT_KEY(k) (&(k)->key)
-#elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */
+#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK) /* Heimdal */
#define KRB5_KT_KEY(k) (&(k)->keyblock)
#else
#error krb5_keytab_entry has no key or keyblock member
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 0055255a9a5..c66720b1765 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -56,7 +56,7 @@
#ifdef HAVE_INTTYPES_H
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-#elif HAVE_STDINT_H
+#elif defined(HAVE_STDINT_H)
#include <stdint.h>
/* force off HAVE_INTTYPES_H so that roken doesn't try to include both,
which causes a warning storm on irix */
diff --git a/lib/replace/system/gssapi.h b/lib/replace/system/gssapi.h
index 9e68dcc1c88..d8632d7782f 100644
--- a/lib/replace/system/gssapi.h
+++ b/lib/replace/system/gssapi.h
@@ -31,11 +31,11 @@
#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
#include <gssapi/gssapi_ext.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
#include <gssapi/gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
+#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
#include <gssapi/gssapi_generic.h>
-#elif HAVE_GSSAPI_H
+#elif defined(HAVE_GSSAPI_H)
#include <gssapi.h>
#endif
@@ -45,7 +45,7 @@
#ifdef HAVE_GSSAPI_GSSAPI_SPNEGO_H
#include <gssapi/gssapi_spnego.h>
-#elif HAVE_GSSAPI_SPNEGO_H
+#elif defined(HAVE_GSSAPI_SPNEGO_H)
#include <gssapi_spnego.h>
#endif
diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h
index 5dc3e75dd3d..29379626e0d 100644
--- a/lib/replace/system/readline.h
+++ b/lib/replace/system/readline.h
@@ -48,7 +48,7 @@
#ifdef HAVE_NEW_LIBREADLINE
#ifdef HAVE_CPPFUNCTION
# define RL_COMPLETION_CAST (CPPFunction *)
-#elif HAVE_RL_COMPLETION_T
+#elif defined(HAVE_RL_COMPLETION_T)
# define RL_COMPLETION_CAST (rl_completion_t *)
#else
# define RL_COMPLETION_CAST
diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index dd0bd981f20..ab4cef92bd5 100644
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -501,7 +501,7 @@ int tstream_disconnect_recv(struct tevent_req *req,
*/
bool tsocket_address_is_inet(const struct tsocket_address *addr, const char *fam);
-#if DOXYGEN
+#ifdef DOXYGEN
/**
* @brief Create a tsocket_address for ipv4 and ipv6 endpoint addresses.
*
diff --git a/lib/util/fault.c b/lib/util/fault.c
index 1b56361aa62..bde20e33460 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -248,7 +248,7 @@ void log_stack_trace(void)
libunwind_failed:
DEBUG(0, ("unable to produce a stack trace with libunwind\n"));
-#elif HAVE_BACKTRACE_SYMBOLS
+#elif defined(HAVE_BACKTRACE_SYMBOLS)
void *backtrace_stack[BACKTRACE_STACK_SIZE];
size_t backtrace_size;
char **backtrace_strings;
diff --git a/nsswitch/nsstest.h b/nsswitch/nsstest.h
index 53adce55005..8112b57f8aa 100644
--- a/nsswitch/nsstest.h
+++ b/nsswitch/nsstest.h
@@ -44,7 +44,7 @@ typedef nss_status_t NSS_STATUS;
#define NSS_STATUS_UNAVAIL NSS_UNAVAIL
#define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN
-#elif HAVE_NSS_H
+#elif defined(HAVE_NSS_H)
/*
* Linux (glibc)
@@ -53,7 +53,7 @@ typedef nss_status_t NSS_STATUS;
#include <nss.h>
typedef enum nss_status NSS_STATUS;
-#elif HAVE_NS_API_H
+#elif defined(HAVE_NS_API_H)
/*
* SGI IRIX
diff --git a/nsswitch/winbind_nss.h b/nsswitch/winbind_nss.h
index e98a961bc11..53250d6f9fd 100644
--- a/nsswitch/winbind_nss.h
+++ b/nsswitch/winbind_nss.h
@@ -32,7 +32,7 @@
#include "nsswitch/winbind_nss_solaris.h"
#include "nsswitch/winbind_nss_linux.h"
-#elif HAVE_NSS_H
+#elif defined(HAVE_NSS_H)
/*
* Linux (glibc)
@@ -44,7 +44,7 @@ typedef enum nss_status NSS_STATUS;
#include "nsswitch/winbind_nss_linux.h"
-#elif HAVE_NS_API_H
+#elif defined(HAVE_NS_API_H)
/*
* SGI IRIX
diff --git a/source3/include/includes.h b/source3/include/includes.h
index acd0788ff4d..c26b75f5791 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -105,7 +105,7 @@
#ifdef HAVE_VALGRIND_MEMCHECK_H
/* memcheck.h includes valgrind.h */
#include <valgrind/memcheck.h>
-#elif HAVE_VALGRIND_H
+#elif defined(HAVE_VALGRIND_H)
#include <valgrind.h>
#endif
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 00dd21ccbd6..9dd04ca5e3d 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -580,7 +580,7 @@ char *sys_getwd(void)
{
#ifdef GETCWD_TAKES_NULL
return getcwd(NULL, 0);
-#elif HAVE_GETCWD
+#elif defined(HAVE_GETCWD)
char *wd = NULL, *s = NULL;
size_t allocated = PATH_MAX;
--
Samba Shared Repository
More information about the samba-cvs
mailing list