pull-prototypes-to-head-20020821

[openafs.git] / src / log / unlog.c

diff --git a/src/log/unlog.c b/src/log/unlog.c
index d5a97c7..0285c2a 100644 (file)
--- a/src/log/unlog.c
+++ b/src/log/unlog.c
@@ -36,11 +36,15 @@ RCSID("$Header$");
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif
-#ifdef AFS_SUN5_ENV
+
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -53,12 +57,6 @@ RCSID("$Header$");
 #include <afs/afsutil.h>
 #include <afs/cmd.h>
 
-#ifdef AFS_OSF_ENV
-void *malloc();
-#else
-char *malloc();
-#endif
-
 #undef VIRTUE
 #undef VICE
 
@@ -124,7 +122,7 @@ main(argc, argv)
     sigaction(SIGSEGV, &nsa, NULL);
 #endif
 
-    ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "Release Kerberos authentication");
+    ts = cmd_CreateSyntax(NULL, CommandProc, 0, "Release Kerberos authentication");
     cmd_AddParm(ts, "-cell", CMD_LIST, CMD_OPTIONAL, "cell name");
 
     code = cmd_Dispatch(argc, argv);