Libinfo-222.4.9.tar.gz

[apple/libinfo.git] / rpc.subproj / types.h

diff --git a/rpc.subproj/types.h b/rpc.subproj/types.h
index b9cd3cf9d02809043857cb172f36ee7584df8a3e..33ae11ca47fa49a6dc0a33ddb9099bdbf21e1827 100644 (file)
--- a/rpc.subproj/types.h
+++ b/rpc.subproj/types.h
@@ -51,7 +51,7 @@
  *
  *     from: @(#)types.h 1.18 87/07/24 SMI
  *     from: @(#)types.h       2.3 88/08/15 4.0 RPCSRC
- *     $Id: types.h,v 1.2 1999/10/14 21:56:54 wsanchez Exp $
+ *     $Id: types.h,v 1.4 2003/10/16 22:15:15 majka Exp $
  */
 
 /*
@@ -70,11 +70,20 @@
 #ifndef TRUE
 #      define TRUE     (1)
 #endif
+
 #ifndef NULL
-#      define NULL     0
-#endif
+#ifdef __GNUG__
+#define NULL __null
+#else /* ! __GNUG__ */
+#ifndef __cplusplus
+#define NULL ((void *)0)
+#else /* __cplusplus */
+#define NULL 0
+#endif /* ! __cplusplus */
+#endif /* __GNUG__ */
+#endif /* ! NULL */
 
-#define mem_alloc(bsize)       malloc(bsize)
+#define mem_alloc(bsize)       calloc(1, bsize)
 #define mem_free(ptr, bsize)   free(ptr)
 
 #ifndef makedev /* ie, we haven't already included it */