Incorrect version guards around the TCP_TABLE_CLASS enumeration:
	http://msdn.microsoft.com/en-us/library/aa366386(VS.85).aspx
	* iprtrmib.h (TCP_TABLE_CLASS): Remove version guards.
	* iphlpapi.h (TCP_TABLE_CLASS): Remove. iphlpapi.h already relies on
	and includes iprtrmib.h.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2824 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ChangeLog

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 2feaa1b..c3e37e6 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-09  Ozkan Sezer  <sezeroz@gmail.com>
+
+	Incorrect version guards around the TCP_TABLE_CLASS enumeration:
+	http://msdn.microsoft.com/en-us/library/aa366386(VS.85).aspx
+	* iprtrmib.h (TCP_TABLE_CLASS): Remove version guards.
+	* iphlpapi.h (TCP_TABLE_CLASS): Remove. iphlpapi.h already relies on
+	and includes iprtrmib.h.
+
 2010-07-08  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* evntcons.h: New. Merge from experimental/vista_7_headers.

mingw-w64-headers/include/iphlpapi.h

diff --git a/mingw-w64-headers/include/iphlpapi.h b/mingw-w64-headers/include/iphlpapi.h
index 82ade3a..9ef0576 100644
--- a/mingw-w64-headers/include/iphlpapi.h
+++ b/mingw-w64-headers/include/iphlpapi.h
@@ -14,20 +14,6 @@
 #include <ipexport.h>
 #include <iptypes.h>
 
-#if (_WIN32_WINNT == 0x502 && WINVER == 0x502)
-typedef enum _TCP_TABLE_CLASS {
-  TCP_TABLE_BASIC_LISTENER,
-  TCP_TABLE_BASIC_CONNECTIONS,
-  TCP_TABLE_BASIC_ALL,
-  TCP_TABLE_OWNER_PID_LISTENER,
-  TCP_TABLE_OWNER_PID_CONNECTIONS,
-  TCP_TABLE_OWNER_PID_ALL,
-  TCP_TABLE_OWNER_MODULE_LISTENER,
-  TCP_TABLE_OWNER_MODULE_CONNECTIONS,
-  TCP_TABLE_OWNER_MODULE_ALL
-} TCP_TABLE_CLASS, *PTCP_TABLE_CLASS;
-#endif
-
   DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf);
   DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow);
   DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable,PULONG pdwSize,WINBOOL bOrder);

mingw-w64-headers/include/iprtrmib.h

diff --git a/mingw-w64-headers/include/iprtrmib.h b/mingw-w64-headers/include/iprtrmib.h
index a076268..0d652a8 100644
--- a/mingw-w64-headers/include/iprtrmib.h
+++ b/mingw-w64-headers/include/iprtrmib.h
@@ -274,7 +274,6 @@
 
 #define MIB_TCP_MAXCONN_DYNAMIC (DWORD)-1
 
-#if (_WIN32_WINNT >= 0x600 && WINVER >= 0x600)
 typedef enum _TCP_TABLE_CLASS {
   TCP_TABLE_BASIC_LISTENER,
   TCP_TABLE_BASIC_CONNECTIONS,
@@ -286,7 +285,6 @@
   TCP_TABLE_OWNER_MODULE_CONNECTIONS,
   TCP_TABLE_OWNER_MODULE_ALL
 } TCP_TABLE_CLASS, *PTCP_TABLE_CLASS;
-#endif
 
 typedef struct _MIB_TCPROW {
   DWORD dwState;