summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-01-03 03:07:51 +0000
committerTim Potter <tpot@samba.org>2002-01-03 03:07:51 +0000
commitba1b5383cc282b95e6dabbc4174c9084383dbd31 (patch)
tree8926a3df445f5b0a0deb2d78bc47aef2ff2f0080
parentc3a564512120fbd8ec03c0ddf65455f74656d1e2 (diff)
downloadsamba-ba1b5383cc282b95e6dabbc4174c9084383dbd31.tar.gz
samba-ba1b5383cc282b95e6dabbc4174c9084383dbd31.tar.bz2
samba-ba1b5383cc282b95e6dabbc4174c9084383dbd31.zip
Welcome to preprocessor hell. Had to put a #ifndef around SAFE_FREE to
stop smb_macros.h and tdb.h from fighting with each other. I tried to rearrange the #include file order but that breaks other stuff. Aargh! (This used to be commit aae8cc6e450a6a0b33045ed1e6d49f8eebeb48b2)
-rw-r--r--source3/include/smb_macros.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 44b8c26da9..de6f1dc3ba 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -38,7 +38,10 @@
#define IS_DOS_HIDDEN(test_mode) (((test_mode) & aHIDDEN) != 0)
/* free memory if the pointer is valid and zero the pointer */
+
+#ifndef SAFE_FREE /* Oh no this is also defined in tdb.h */
#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+#endif
/* zero a structure */
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))