summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-01-03 14:22:32 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2020-01-03 14:22:32 -0800
commit089dcff0067beb35e699f9da57d04b8fb6824132 (patch)
tree0a7c3854b33960847c40ad953f00a7bebbd30c0c
parent82f72ff959206ed49a96afad707790bfdbed5c99 (diff)
downloadpsutil-089dcff0067beb35e699f9da57d04b8fb6824132.tar.gz
include ntextapi.h from globals.h so that we won't have to import it ever
-rw-r--r--psutil/arch/windows/cpu.c1
-rw-r--r--psutil/arch/windows/disk.c1
-rw-r--r--psutil/arch/windows/globals.c1
-rw-r--r--psutil/arch/windows/globals.h2
-rw-r--r--psutil/arch/windows/net.c1
-rw-r--r--psutil/arch/windows/process_handles.c1
-rw-r--r--psutil/arch/windows/process_info.c1
-rw-r--r--psutil/arch/windows/process_utils.c1
-rw-r--r--psutil/arch/windows/socks.c1
9 files changed, 1 insertions, 9 deletions
diff --git a/psutil/arch/windows/cpu.c b/psutil/arch/windows/cpu.c
index b44f6c0c..59bedb44 100644
--- a/psutil/arch/windows/cpu.c
+++ b/psutil/arch/windows/cpu.c
@@ -8,7 +8,6 @@
#include <windows.h>
#include <PowrProf.h>
-#include "ntextapi.h"
#include "globals.h"
#include "../../_psutil_common.h"
diff --git a/psutil/arch/windows/disk.c b/psutil/arch/windows/disk.c
index cb36c0b3..e927bf2e 100644
--- a/psutil/arch/windows/disk.c
+++ b/psutil/arch/windows/disk.c
@@ -8,7 +8,6 @@
#include <windows.h>
#include <tchar.h>
-#include "ntextapi.h"
#include "globals.h"
#include "../../_psutil_common.h"
diff --git a/psutil/arch/windows/globals.c b/psutil/arch/windows/globals.c
index 50505102..e600c3bd 100644
--- a/psutil/arch/windows/globals.c
+++ b/psutil/arch/windows/globals.c
@@ -10,7 +10,6 @@
#include <windows.h>
#include <Python.h>
-#include "ntextapi.h"
#include "globals.h"
diff --git a/psutil/arch/windows/globals.h b/psutil/arch/windows/globals.h
index 6764dde0..edae4271 100644
--- a/psutil/arch/windows/globals.h
+++ b/psutil/arch/windows/globals.h
@@ -7,7 +7,7 @@
*/
#include <windows.h>
-#include "ntextapi.h"
+#include "ntextapi.h" // make it available to any file including us
extern int PSUTIL_WINVER;
extern SYSTEM_INFO PSUTIL_SYSTEM_INFO;
diff --git a/psutil/arch/windows/net.c b/psutil/arch/windows/net.c
index 271ac06a..cb9c1564 100644
--- a/psutil/arch/windows/net.c
+++ b/psutil/arch/windows/net.c
@@ -12,7 +12,6 @@
#include <wchar.h>
#include <ws2tcpip.h>
-#include "ntextapi.h"
#include "globals.h"
diff --git a/psutil/arch/windows/process_handles.c b/psutil/arch/windows/process_handles.c
index 5877715e..024d00a3 100644
--- a/psutil/arch/windows/process_handles.c
+++ b/psutil/arch/windows/process_handles.c
@@ -9,7 +9,6 @@
#include <Psapi.h> // GetMappedFileName()
#include <Python.h>
-#include "ntextapi.h"
#include "globals.h"
#include "process_utils.h"
diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/process_info.c
index a3e66a02..e8fe8b7d 100644
--- a/psutil/arch/windows/process_info.c
+++ b/psutil/arch/windows/process_info.c
@@ -10,7 +10,6 @@
#include <Python.h>
#include <windows.h>
-#include "ntextapi.h"
#include "globals.h"
#include "process_utils.h"
#include "../../_psutil_common.h"
diff --git a/psutil/arch/windows/process_utils.c b/psutil/arch/windows/process_utils.c
index e10c7f5c..d9997ad0 100644
--- a/psutil/arch/windows/process_utils.c
+++ b/psutil/arch/windows/process_utils.c
@@ -10,7 +10,6 @@
#include <windows.h>
#include <Psapi.h> // EnumProcesses
-#include "ntextapi.h"
#include "globals.h"
#include "process_utils.h"
#include "../../_psutil_common.h"
diff --git a/psutil/arch/windows/socks.c b/psutil/arch/windows/socks.c
index 50d29687..04ea6285 100644
--- a/psutil/arch/windows/socks.c
+++ b/psutil/arch/windows/socks.c
@@ -11,7 +11,6 @@
#include <windows.h>
#include <ws2tcpip.h>
-#include "ntextapi.h"
#include "globals.h"
#include "process_utils.h"
#include "../../_psutil_common.h"