summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-02-20 07:17:37 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2019-02-20 07:17:37 -0800
commitaba261d95fcdd95594db7be28267e38cd30d0103 (patch)
tree8291fbed10e29a6c91258918b6ed2938da9d8fdd
parent9a03d6d9557e6177d4b5172a4b4bf13777b43a45 (diff)
downloadpsutil-aba261d95fcdd95594db7be28267e38cd30d0103.tar.gz
remove win xp support
-rw-r--r--psutil/_psutil_windows.c30
-rw-r--r--psutil/arch/windows/ntextapi.h9
2 files changed, 9 insertions, 30 deletions
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index 1110bbd3..84a86544 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -70,36 +70,6 @@ typedef BOOL (WINAPI *PFN_GETLOGICALPROCESSORINFORMATIONEX)(
static PFN_GETLOGICALPROCESSORINFORMATIONEX _GetLogicalProcessorInformationEx;
#endif
-#ifndef __IPHLPAPI_H__
-typedef struct in6_addr {
- union {
- UCHAR Byte[16];
- USHORT Word[8];
- } u;
-} IN6_ADDR, *PIN6_ADDR, FAR *LPIN6_ADDR;
-
-typedef struct _MIB_UDPROW_OWNER_PID {
- DWORD dwLocalAddr;
- DWORD dwLocalPort;
- DWORD dwOwningPid;
-} MIB_UDPROW_OWNER_PID, *PMIB_UDPROW_OWNER_PID;
-
-#endif
-
-#if (_WIN32_WINNT < 0x0600) // Windows XP
-typedef struct _MIB_UDP6ROW_OWNER_PID {
- UCHAR ucLocalAddr[16];
- DWORD dwLocalScopeId;
- DWORD dwLocalPort;
- DWORD dwOwningPid;
-} MIB_UDP6ROW_OWNER_PID, *PMIB_UDP6ROW_OWNER_PID;
-
-typedef struct _MIB_UDP6TABLE_OWNER_PID {
- DWORD dwNumEntries;
- MIB_UDP6ROW_OWNER_PID table[ANY_SIZE];
-} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID;
-#endif
-
PIP_ADAPTER_ADDRESSES
psutil_get_nic_addresses() {
// allocate a 15 KB buffer to start with
diff --git a/psutil/arch/windows/ntextapi.h b/psutil/arch/windows/ntextapi.h
index 029a83c3..e94245a2 100644
--- a/psutil/arch/windows/ntextapi.h
+++ b/psutil/arch/windows/ntextapi.h
@@ -329,6 +329,15 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
ULONG CurrentIdleState;
} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
+#ifndef __IPHLPAPI_H__
+typedef struct in6_addr {
+ union {
+ UCHAR Byte[16];
+ USHORT Word[8];
+ } u;
+} IN6_ADDR, *PIN6_ADDR, FAR *LPIN6_ADDR;
+#endif
+
/*
* ================================================================
* Type defs.