diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/includes.h | 1 | ||||
-rw-r--r-- | source3/include/smb_macros.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index df0448bb9c..1f97a2d7ed 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -640,6 +640,7 @@ extern int errno; #include "messages.h" #include "util_list.h" #include "charset.h" +#include "xfile.h" #include "util_getent.h" diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 315cb5e5ee..52649ffc39 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -41,7 +41,7 @@ #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) /* zero a structure given a pointer to the structure */ -#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } +#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0) /* zero a structure given a pointer to the structure - no zero check */ #define ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x))) |