From 4a967a5d5c2fbf8e4cda3b24d79c454e0e1fea69 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Sun, 18 Mar 2001 21:39:24 +0000
Subject: [PATCH] moved stuff from net-internal.h to network.h. HPUX needed one
 of the #includes in there to work.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1409 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/core/Makefile.am    | 1 -
 src/core/net-internal.h | 8 --------
 src/core/network.c      | 1 -
 src/core/network.h      | 6 ++++++
 4 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 src/core/net-internal.h

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 0f1ff588..1dc2f5f9 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -78,7 +78,6 @@ noinst_HEADERS = \
 	module.h \
 	modules.h \
 	net-disconnect.h \
-	net-internal.h \
 	net-nonblock.h \
 	net-sendbuffer.h \
 	network.h \
diff --git a/src/core/net-internal.h b/src/core/net-internal.h
deleted file mode 100644
index dd870a1b..00000000
--- a/src/core/net-internal.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef HAVE_SOCKS_H
-#include <socks.h>
-#endif
-
-#ifndef WIN32
-#  include <netdb.h>
-#  include <arpa/inet.h>
-#endif
diff --git a/src/core/network.c b/src/core/network.c
index 535cdcf8..5315d063 100644
--- a/src/core/network.c
+++ b/src/core/network.c
@@ -20,7 +20,6 @@
 
 #include "module.h"
 #include "network.h"
-#include "net-internal.h"
 
 #ifndef INADDR_NONE
 #  define INADDR_NONE INADDR_BROADCAST
diff --git a/src/core/network.h b/src/core/network.h
index 0697c4c8..4c25740f 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -1,10 +1,16 @@
 #ifndef __NETWORK_H
 #define __NETWORK_H
 
+#ifdef HAVE_SOCKS_H
+#include <socks.h>
+#endif
+
 #include <sys/types.h>
 #ifndef WIN32
 #  include <sys/socket.h>
 #  include <netinet/in.h>
+#  include <netdb.h>
+#  include <arpa/inet.h>
 #endif
 
 #ifndef AF_INET6