From a86ea17b8a05b575f444e6e37b1c308f3f543a1e Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Sun, 1 Oct 2000 20:09:53 +0000
Subject: [PATCH]         * include/ipifcons.h: New header file.         *
 include/iprtrmib.h: Move operational states to ipifcons.h.         *
 include/iphlpapi.h: Add missing parameters to GetIfTable()        
 declaration.

---
 winsup/w32api/ChangeLog          |  7 +++++++
 winsup/w32api/include/iphlpapi.h |  2 +-
 winsup/w32api/include/ipifcons.h | 23 +++++++++++++++++++++++
 winsup/w32api/include/iprtrmib.h |  6 ------
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 winsup/w32api/include/ipifcons.h

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9b218321d..bbd00eb79 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct  1 22:09:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+        * include/ipifcons.h: New header file.
+        * include/iprtrmib.h: Move operational states to ipifcons.h.
+        * include/iphlpapi.h: Add missing parameters to GetIfTable()
+        declaration.
+
 Sun Oct  1 16:30:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
         * include/iprtrmib.h: Add missing MIB_IF_OPER_STATUS_xxx definitions.
diff --git a/winsup/w32api/include/iphlpapi.h b/winsup/w32api/include/iphlpapi.h
index 9b85ebe5c..1bc5b00f9 100644
--- a/winsup/w32api/include/iphlpapi.h
+++ b/winsup/w32api/include/iphlpapi.h
@@ -15,7 +15,7 @@ DWORD WINAPI GetBestRoute(DWORD,DWORD,PMIB_IPFORWARDROW);
 DWORD WINAPI GetFriendlyIfIndex(DWORD);
 DWORD WINAPI GetIcmpStatistics(PMIB_ICMP);
 DWORD WINAPI GetIfEntry(PMIB_IFROW);
-DWORD WINAPI GetIfTable(PMIB_IFTABLE);
+DWORD WINAPI GetIfTable(PMIB_IFTABLE,PULONG,BOOL);
 DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO,PULONG);
 DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE,PULONG,BOOL);
 DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE,PULONG,BOOL);
diff --git a/winsup/w32api/include/ipifcons.h b/winsup/w32api/include/ipifcons.h
new file mode 100644
index 000000000..d0b2c9a1a
--- /dev/null
+++ b/winsup/w32api/include/ipifcons.h
@@ -0,0 +1,23 @@
+#ifndef _IPIFCONS_H_
+#define _IPIFCONS_H_
+
+#define MIB_IF_ADMIN_STATUS_UP 1
+#define MIB_IF_ADMIN_STATUS_DOWN 2
+#define MIB_IF_ADMIN_STATUS_TESTING 3
+
+#define MIB_IF_OPER_STATUS_NON_OPERATIONAL 0
+#define MIB_IF_OPER_STATUS_UNREACHABLE 1
+#define MIB_IF_OPER_STATUS_DISCONNECTED 2
+#define MIB_IF_OPER_STATUS_CONNECTING 3
+#define MIB_IF_OPER_STATUS_CONNECTED 4
+#define MIB_IF_OPER_STATUS_OPERATIONAL 5
+
+#define MIB_IF_TYPE_OTHER 1
+#define MIB_IF_TYPE_ETHERNET 6
+#define MIB_IF_TYPE_TOKENRING 9
+#define MIB_IF_TYPE_FDDI 15
+#define MIB_IF_TYPE_PPP 23
+#define MIB_IF_TYPE_LOOPBACK 24
+#define MIB_IF_TYPE_SLIP 28
+
+#endif /* _IPIFCONS_H_ */
diff --git a/winsup/w32api/include/iprtrmib.h b/winsup/w32api/include/iprtrmib.h
index e5da2ed6c..d0d02df0c 100644
--- a/winsup/w32api/include/iprtrmib.h
+++ b/winsup/w32api/include/iprtrmib.h
@@ -14,12 +14,6 @@
 #define MAX_INTERFACE_NAME_LEN 256
 #endif
 
-#define MIB_IF_OPER_STATUS_NON_OPERATIONAL 0
-#define MIB_IF_OPER_STATUS_UNREACHABLE 1
-#define MIB_IF_OPER_STATUS_DISCONNECTED 2
-#define MIB_IF_OPER_STATUS_CONNECTING 3
-#define MIB_IF_OPER_STATUS_CONNECTED 4
-
 #define MIB_IPNET_TYPE_OTHER 1
 #define MIB_IPNET_TYPE_INVALID 2
 #define MIB_IPNET_TYPE_DYNAMIC 3