first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[samba.git] / source / smbwrapper / wrapped.c

diff --git a/source/smbwrapper/wrapped.c b/source/smbwrapper/wrapped.c
index 4703614d649d87a6edbfc340ebac1f88da00c784..1b356e6a26defa186dfe58ae7e91e4002329fe9a 100644 (file)
--- a/source/smbwrapper/wrapped.c
+++ b/source/smbwrapper/wrapped.c
@@ -30,6 +30,10 @@
 #include <errno.h>
 #include "realcalls.h"
 
+#ifndef NULL
+# define NULL ((void *)0)
+#endif
+
  int open(char *name, int flags, mode_t mode)
 {
        if (smbw_path(name)) {
@@ -687,7 +691,7 @@
                static double xx[70];
                void *d;
                d = (void *)readdir(dir);
-               if (!d) return (void *)0;
+               if (!d) return NULL;
                dirent64_convert(d, xx);
                return xx;
        }
@@ -699,3 +703,4 @@
 {
        return smbw_fork();
 }
+