summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-02-20 07:01:00 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2019-02-20 07:01:00 -0800
commit86a18e40292b02b55b2e58eda59505de6badf349 (patch)
tree9fbd2bc2d0d87934aef2aac0156365569e0b6496
parent071786df740d693602106bd39fb9680a78fd2a23 (diff)
downloadpsutil-86a18e40292b02b55b2e58eda59505de6badf349.tar.gz
move struct
-rw-r--r--psutil/_psutil_windows.c10
-rw-r--r--psutil/arch/windows/ntextapi.h13
2 files changed, 13 insertions, 10 deletions
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index 20b97bab..281fa1df 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -149,16 +149,6 @@ typedef struct _MIB_UDP6TABLE_OWNER_PID {
} MIB_UDP6TABLE_OWNER_PID, *PMIB_UDP6TABLE_OWNER_PID;
#endif
-typedef struct _PROCESSOR_POWER_INFORMATION {
- ULONG Number;
- ULONG MaxMhz;
- ULONG CurrentMhz;
- ULONG MhzLimit;
- ULONG MaxIdleState;
- ULONG CurrentIdleState;
-} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
-
-
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 6f364b76..96de388f 100644
--- a/psutil/arch/windows/ntextapi.h
+++ b/psutil/arch/windows/ntextapi.h
@@ -258,6 +258,19 @@ typedef struct _SYSTEM_PROCESS_INFORMATION2 {
#define SYSTEM_PROCESS_INFORMATION SYSTEM_PROCESS_INFORMATION2
#define PSYSTEM_PROCESS_INFORMATION PSYSTEM_PROCESS_INFORMATION2
+typedef struct _PROCESSOR_POWER_INFORMATION {
+ ULONG Number;
+ ULONG MaxMhz;
+ ULONG CurrentMhz;
+ ULONG MhzLimit;
+ ULONG MaxIdleState;
+ ULONG CurrentIdleState;
+} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
+
+/*
+ * Type defs
+ */
+
typedef struct _WINSTATION_INFO {
BYTE Reserved1[72];
ULONG SessionId;