security descriptors

[samba.git] / source3 / include / smb.h

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4f064d27d186e41a71785dccd686c149abe613e1..9339cdda6f06e5c3e622613cfce6e776b039e685 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1655,11 +1655,7 @@ extern int unix_ERR_code;
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
 
 /* zero a structure given a pointer to the structure */
-#if 0
-#define ZERO_STRUCTP(x) { }
-#else
-#define ZERO_STRUCTP(x) { if (x != NULL) memset((char *)(x), 0, sizeof(*(x))); }
-#endif
+#define ZERO_STRUCTP(x) { memset((char *)(x), 0, sizeof(*(x))); }
 
 #define ZERO_STRUCTPN(x) { if (x != NULL) ZERO_STRUCTP(x); }