From d24a74c5b4fb62b720a79b632021746b69de7c45 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 30 Apr 2009 11:37:54 +0000
Subject: merging changes from portability branch back to trunk

important change for developers: %Y replaces %D to print identities!
---
 src/libfreeswan/internal.h | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'src/libfreeswan/internal.h')

diff --git a/src/libfreeswan/internal.h b/src/libfreeswan/internal.h
index c18db31f5..a97cce905 100644
--- a/src/libfreeswan/internal.h
+++ b/src/libfreeswan/internal.h
@@ -35,47 +35,14 @@
 #define	PASSTHROUGHDST	0
 #endif
 
-/*
- * Headers, greatly complicated by stupid and unnecessary inconsistencies
- * between the user environment and the kernel environment.  These are done
- * here so that this mess need exist in only one place.
- *
- * It may seem like a -I or two could avoid most of this, but on closer
- * inspection it is not quite that easy.
- */
-
-/* things that need to come from one place or the other, depending */
-#ifdef __KERNEL__
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <linux/in.h>
-#include <linux/string.h>
-#include <linux/ctype.h>
-#define	assert(foo)	/* nothing */
-#else
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-#endif
-
-/* things that exist only in userland */
-#ifndef __KERNEL__
-
-/* You'd think this would be okay in the kernel too -- it's just a */
-/* bunch of constants -- but no, in RH5.1 it screws up other things. */
-/* (Credit:  Mike Warfield tracked this problem down.  Thanks Mike!) */
-/* Fortunately, we don't need it in the kernel subset of the library. */
 #include <limits.h>
-
-/* header files for things that should never be called in kernel */
 #include <netdb.h>
-
-/* memory allocation, currently user-only, macro-ized just in case */
 #include <stdlib.h>
 #define	MALLOC(n)	malloc(n)
 #define	FREE(p)		free(p)
 
-#endif /* __KERNEL__ */
-
-- 
cgit v1.2.3