diff -uNr afs-krb5.orig/src/aklog_main.c afs-krb5/src/aklog_main.c
--- afs-krb5.orig/src/aklog_main.c	2003-03-16 20:13:34.000000000 -0500
+++ afs-krb5/src/aklog_main.c	2004-05-17 19:33:21.000000000 -0400
@@ -109,7 +109,7 @@
 #define AKLOG_MISC 7
 
 #ifndef NULL
-#define NULL 0
+#define NULL (void *)0
 #endif
 
 #ifndef TRUE
diff -uNr afs-krb5.orig/src/aklog_param.c afs-krb5/src/aklog_param.c
--- afs-krb5.orig/src/aklog_param.c	1999-05-25 14:24:38.000000000 -0400
+++ afs-krb5/src/aklog_param.c	2004-05-17 19:33:21.000000000 -0400
@@ -96,8 +96,8 @@
     if ((r = krb5_build_principal(context, &increds.server,
                      strlen(realm), realm,
                      name,
-           (inst && strlen(inst)) ? inst : 0,
-                     0))) {
+           (inst && strlen(inst)) ? inst : NULL,
+                     NULL))) {
         return((int)r);
     }
 
diff -uNr afs-krb5.orig/src/linked_list.c afs-krb5/src/linked_list.c
--- afs-krb5.orig/src/linked_list.c	2004-05-17 19:33:11.000000000 -0400
+++ afs-krb5/src/linked_list.c	2004-05-17 19:33:21.000000000 -0400
@@ -17,7 +17,7 @@
 #include "linked_list.h"
 
 #ifndef NULL
-#define NULL 0
+#define NULL (void *)0
 #endif
 
 #ifndef TRUE