From 650c86d47dde3d5193b38d2cd3f87b29ac250757 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 13 Jun 2001 04:56:22 +0000
Subject: [PATCH] avoid-string-h-conflict-in-kernel-rx-20010612

avoid conflicting with kernel's string.h
---
 src/rx/rx.c        | 12 ++++++------
 src/rx/rx_misc.c   |  3 +--
 src/rx/rx_packet.c |  3 +--
 src/rx/rx_rdwr.c   | 15 +++++++--------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index f87a06c1f..4509653b7 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -83,6 +83,12 @@ extern afs_int32 afs_termState;
 # include <netinet/in.h>
 # include <sys/time.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 # include "rx.h"
 # include "rx_user.h"
 # include "rx_clock.h"
@@ -92,12 +98,6 @@ extern afs_int32 afs_termState;
 # include "rx_internal.h"
 # include <afs/rxgen_consts.h>
 #endif /* KERNEL */
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 
 int (*registerProgram)() = 0;
 int (*swapNameProgram)() = 0;
diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c
index c469d9c29..452715e65 100644
--- a/src/rx/rx_misc.c
+++ b/src/rx/rx_misc.c
@@ -26,7 +26,6 @@
 #include "rx.h"
 #endif /* AFS_PTHREAD_ENV */
 #include <stdlib.h>
-#endif
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -36,7 +35,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
+#endif
 
 /*
  * We currently only include below the errors that
diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 8c89d3bf7..4e3a4f680 100644
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -72,7 +72,6 @@
 #include "rx_globals.h"
 #include <lwp.h>
 #include "rx_internal.h"
-#endif /* KERNEL */
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -82,7 +81,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
+#endif /* KERNEL */
 
 #ifdef RX_LOCKS_DB
 /* rxdb_fileID is used to identify the lock location, along with line#. */
diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index cd5478133..358c396a8 100644
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -67,13 +67,6 @@
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
-# include "rx_user.h"
-# include "rx_clock.h"
-# include "rx_queue.h"
-# include "rx.h"
-# include "rx_globals.h"
-# include "rx_internal.h"
-#endif /* KERNEL */
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -83,7 +76,13 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
+# include "rx_user.h"
+# include "rx_clock.h"
+# include "rx_queue.h"
+# include "rx.h"
+# include "rx_globals.h"
+# include "rx_internal.h"
+#endif /* KERNEL */
 
 #ifdef RX_LOCKS_DB
 /* rxdb_fileID is used to identify the lock location, along with line#. */
-- 
2.39.5