From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 29 Oct 2010 18:19:48 +0000 (+0100)
Subject: util: netutils never builds in the kernel ...
X-Git-Tag: upstream/1.8.0_pre1^2~4574
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c094874817d00dc0df7d48c070f0b5d4673ee349;p=packages%2Fo%2Fopenafs.git

util: netutils never builds in the kernel ...

... so stop pretending that it does.

Change-Id: I9d1d7c9b8c826f18e7f02decdb555956b257e155
Reviewed-on: http://gerrit.openafs.org/3201
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/util/netutils.c b/src/util/netutils.c
index 4f47f456b..d987ed108 100644
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -13,32 +13,22 @@
  */
 
 #include <afsconfig.h>
-#ifdef KERNEL
-#include "afs/param.h"
-#else
 #include <afs/param.h>
-#endif
-
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef KERNEL
-#include "afs/sysincludes.h"
-#include "afsincludes.h"
+#if defined(AFS_NT40_ENV)
+# include <winsock2.h>
 #else
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#endif
-#include <netinet/in.h>
-#include <sys/errno.h>
+# if defined(__FreeBSD__)
+#  include <sys/types.h>
+# endif
+# include <netinet/in.h>
+# include <sys/errno.h>
 #endif
 #include <errno.h>
-#endif
 
 #include <rx/rx.h>