util-warning-cleanup-20011005

[openafs.git] / src / util / uuid.c

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 9df09b0..f4629c3 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -7,20 +7,20 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #ifdef KERNEL
 #include "../afs/param.h"
 #else
 #include <afs/param.h>
 #endif
-#include <afsconfig.h>
 
 RCSID("$Header$");
 
 #ifdef KERNEL
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"
-#define uuid_memcmp(A,B,C)     bcmp(A,B,C)
-#define uuid_memcpy(A,B,C)     bcopy(B,A,C)
+#define uuid_memcmp(A,B,C)     memcmp(A, B, C)
+#define uuid_memcpy(A,B,C)     memcpy(A, B, C)
 #else /* KERNEL */
 #include <stdio.h>
 #include <errno.h>
@@ -37,6 +37,17 @@ RCSID("$Header$");
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
 #include <net/if.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>