From 60fed7e0773745d919253ada6a83bd1a91213726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 23 Nov 2010 21:44:37 +0000
Subject: [PATCH] * Moved the shared part of NetServer.h into a new private
 header.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39597 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/net/NetServer.h               | 20 +++++++++++++++++++
 src/bin/network/ifconfig/Jamfile              |  2 +-
 src/kits/network/libnetapi/Jamfile            |  1 -
 .../network/libnetapi/NetworkInterface.cpp    |  1 -
 src/servers/net/NetServer.h                   | 12 +----------
 5 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 headers/private/net/NetServer.h

diff --git a/headers/private/net/NetServer.h b/headers/private/net/NetServer.h
new file mode 100644
index 0000000000..b80469a06b
--- /dev/null
+++ b/headers/private/net/NetServer.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, axeld@pinc-software.de
+ */
+#ifndef _NET_SERVER_H
+#define _NET_SERVER_H
+
+
+#define kNetServerSignature		"application/x-vnd.haiku-net_server"
+
+#define kMsgConfigureInterface	'COif'
+#define kMsgConfigureResolver	'COrs'
+#define kMsgJoinNetwork			'JNnw'
+#define kMsgLeaveNetwork		'LVnw'
+
+
+#endif	// _NET_SERVER_H
diff --git a/src/bin/network/ifconfig/Jamfile b/src/bin/network/ifconfig/Jamfile
index 3f85f09661..a9dabe9cfe 100644
--- a/src/bin/network/ifconfig/Jamfile
+++ b/src/bin/network/ifconfig/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin network ifconfig ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
+UsePrivateHeaders net ;
 
 BinCommand ifconfig :
 	ifconfig.cpp
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 73106e157b..aa7280bc79 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -5,7 +5,6 @@ UsePrivateHeaders net shared ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
 
 SharedLibrary libbnetapi.so :
 	init.cpp
diff --git a/src/kits/network/libnetapi/NetworkInterface.cpp b/src/kits/network/libnetapi/NetworkInterface.cpp
index 05c45ea207..0a5bf43108 100644
--- a/src/kits/network/libnetapi/NetworkInterface.cpp
+++ b/src/kits/network/libnetapi/NetworkInterface.cpp
@@ -12,7 +12,6 @@
 
 #include <AutoDeleter.h>
 #include <Messenger.h>
-
 #include <NetServer.h>
 
 
diff --git a/src/servers/net/NetServer.h b/src/servers/net/NetServer.h
index 260833d0bc..44282fd9ef 100644
--- a/src/servers/net/NetServer.h
+++ b/src/servers/net/NetServer.h
@@ -11,22 +11,12 @@
 
 #include <SupportDefs.h>
 
-#include <net/if.h>
+#include <NetServer.h>
 
 
 class BNetworkAddress;
 
 
-// TODO: move this into a private shared header
-// NOTE: this header is used by other applications (such as ifconfig,
-// and Network) because of these defines
-#define kNetServerSignature		"application/x-vnd.haiku-net_server"
-#define kMsgConfigureInterface	'COif'
-#define kMsgConfigureResolver	'COrs'
-#define kMsgJoinNetwork			'JNnw'
-#define kMsgLeaveNetwork		'LVnw'
-
-
 int get_address_family(const char* argument);
 bool parse_address(int32& family, const char* argument,
 	BNetworkAddress& address);