Started changes to get this compiling.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@917 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/network/libnet/Jamfile

@@ -1,6 +1,9 @@
 SubDir OBOS_TOP src kits net libnet ;
 
 UsePosixHeaders ;
+UsePrivateHeaders net ;
+SetupIncludes ;
+SubDirCcFlags -nostdinc ;
 
 SharedLibrary net :
 	socket.c
@@ -45,5 +48,4 @@ SharedLibrary net :
 ;
 
 LinkSharedOSLibs libnet.so :
-	root
 ;

src/kits/network/libnet/compat.c

@@ -6,7 +6,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
-#include <kernel/OS.h>
+#include <OS.h>
 #include <iovec.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,7 +18,7 @@ static int32 h_errno_tls;
 /* These should probably be moved to a seperate file as they
  * are unique to the library as a whole...
  */
-
+/*
 void _init()
 {
 	h_errno_tls = tls_allocate();
@@ -27,6 +27,15 @@ void _init()
 void _fini()
 {
 }
+*/
+void initialize_before()
+{
+	h_errno_tls = tls_allocate();
+}
+
+void terminate_after()
+{
+}
 
 struct net_settings {
 	int dummy;

src/kits/network/libnet/gethostnamadr.c

@@ -52,12 +52,12 @@
  */
 
 #include <sys/param.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
-#include "netdb.h"
+#include <netdb.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>

src/kits/network/libnet/getnetbyaddr.c

@@ -32,8 +32,8 @@
  */
 
 #include <kernel/OS.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "netdb.h"
+#include <netdb.h>
 
 extern int _net_stayopen;
 

src/kits/network/libnet/getnetbyname.c

@@ -31,9 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#include <kernel/OS.h>
+#include <OS.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "netdb.h"
+#include <netdb.h>
 #include <string.h>
 
 extern int _net_stayopen;

src/kits/network/libnet/getnetent.c

@@ -33,10 +33,10 @@
 
 #include <sys/types.h>
 #include <kernel/OS.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "netdb.h"
+#include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 

src/kits/network/libnet/getproto.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 
 extern int _proto_stayopen;

src/kits/network/libnet/getprotoent.c

@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>

src/kits/network/libnet/getprotoname.c

@@ -31,8 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "netdb.h"
+#include <netdb.h>
 #include <string.h>
 
 extern int _proto_stayopen;

src/kits/network/libnet/getservbyname.c

@@ -32,7 +32,7 @@
  */
 
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
 

src/kits/network/libnet/getservbyport.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
 

src/kits/network/libnet/getservent.c

@@ -31,9 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>

src/kits/network/libnet/inet_network.c

@@ -32,8 +32,8 @@
  */
 
 #include <sys/types.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
 #include <ctype.h>
 
 /*

src/kits/network/libnet/inet_ntop.c

@@ -16,10 +16,10 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>

src/kits/network/libnet/inet_pton.c

@@ -16,10 +16,10 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
 #include <string.h>
 #include <errno.h>
 

src/kits/network/libnet/linkaddr.c

@@ -33,8 +33,8 @@
 
 #include <sys/types.h>
 #include <kernel/OS.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "net/if_dl.h"
+#include <net/if_dl.h>
 #include <string.h>
 
 /* States*/

src/kits/network/libnet/res_comp.c

@@ -55,14 +55,13 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
-#include "netdb.h" /* for MAXHOSTNAMELEN */
+#include <netdb.h> /* for MAXHOSTNAMELEN */
+#include <resolv.h>
 
 #include <stdio.h>
-#include "resolv.h"
 #include <ctype.h>
-
 #include <unistd.h>
 #include <string.h>
 

src/kits/network/libnet/res_debug.c

@@ -77,14 +77,14 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
 
 #include <ctype.h>
-#include "netdb.h"
+#include <netdb.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <stdio.h>
 #include <time.h>
 

src/kits/network/libnet/res_init.c

@@ -55,19 +55,19 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include <sys/time.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
 
 #include <stdio.h>
 #include <ctype.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "netdb.h"
+#include <netdb.h>
 
 /*-------------------------------------- info about "sortlist" --------------
  * Marc Majka		1994/04/16

src/kits/network/libnet/res_mkquery.c

@@ -53,6 +53,7 @@
  * --Copyright--
  */
 
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>

src/kits/network/libnet/res_random.c

@@ -58,9 +58,9 @@
  */
 
 #include <sys/types.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 #include <sys/time.h>
-#include "resolv.h"
+#include <resolv.h>
 
 #include <unistd.h>
 #include <stdlib.h>

src/kits/network/libnet/res_send.c

@@ -67,17 +67,17 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#include "sys/socket.h"
+#include <sys/socket.h>
 #include <sys/uio.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
-#include "arpa/inet.h"
+#include <arpa/inet.h>
-#include "sys/select.h"
+#include <sys/select.h>
 
 #include <stdio.h>
-#include "netdb.h"
+#include <netdb.h>
 #include <errno.h>
-#include "resolv.h"
+#include <resolv.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

src/kits/network/libnet/select.c

@@ -1,10 +1,10 @@
 #include <unistd.h>
-#include <kernel/image.h>
+#include <image.h>
-#include <kernel/OS.h>
+#include <OS.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/select.h>
-#include <posix/errno.h>
+#include <errno.h>
 
 #include "net_stack_driver.h"
 

src/kits/network/libnet/socket.c

@@ -10,9 +10,9 @@
 #include <iovec.h>
 #include <stdio.h>
 
-#include "sys/socket.h"
+#include <sys/socket.h>
-#include "sys/sockio.h"
+#include <sys/sockio.h>
-#include "netinet/in.h"
+#include <netinet/in.h>
 
 #include "net_stack_driver.h"