about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation/HTUtils.h
diff options
context:
space:
mode:
Diffstat (limited to 'WWW/Library/Implementation/HTUtils.h')
-rw-r--r--WWW/Library/Implementation/HTUtils.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 38710d77..f977a9d5 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -298,11 +298,13 @@ Macros for declarations
 #define NULL ((void *)0)
 #endif
 
+#define NONNULL(s) (((s) != 0) ? s : "(null)")
+
 /* array/table size */
 #define	TABLESIZE(v)	(sizeof(v)/sizeof(v[0]))
 
-#define	typecalloc(cast)		(cast *)calloc(sizeof(cast),1)
-#define	typecallocn(cast,ntypes)	(cast *)calloc(sizeof(cast),ntypes)
+#define	typecalloc(cast)		(cast *)calloc(1,sizeof(cast))
+#define	typecallocn(cast,ntypes)	(cast *)calloc(ntypes,sizeof(cast))
 
 /*