diff options
Diffstat (limited to 'psutil/arch/windows')
| -rw-r--r-- | psutil/arch/windows/proc.c | 13 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_handles.c (renamed from psutil/arch/windows/process_handles.c) | 2 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_handles.h (renamed from psutil/arch/windows/process_handles.h) | 0 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_info.c (renamed from psutil/arch/windows/process_info.c) | 4 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_info.h (renamed from psutil/arch/windows/process_info.h) | 0 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_utils.c (renamed from psutil/arch/windows/process_utils.c) | 2 | ||||
| -rw-r--r-- | psutil/arch/windows/proc_utils.h (renamed from psutil/arch/windows/process_utils.h) | 0 | ||||
| -rw-r--r-- | psutil/arch/windows/socks.c | 2 |
8 files changed, 15 insertions, 8 deletions
diff --git a/psutil/arch/windows/proc.c b/psutil/arch/windows/proc.c index fb5f7bb9..d9b69744 100644 --- a/psutil/arch/windows/proc.c +++ b/psutil/arch/windows/proc.c @@ -4,6 +4,13 @@ * found in the LICENSE file. */ +/* + * Process related functions. Original code was moved in here from + * psutil/_psutil_windows.c in 2023. For reference, here's the GIT blame + * history before the move: + * https://github.com/giampaolo/psutil/blame/59504a5/psutil/_psutil_windows.c +*/ + // Fixes clash between winsock2.h and windows.h #define WIN32_LEAN_AND_MEAN @@ -18,9 +25,9 @@ #include "../../_psutil_common.h" #include "proc.h" -#include "process_info.h" -#include "process_handles.h" -#include "process_utils.h" +#include "proc_info.h" +#include "proc_handles.h" +#include "proc_utils.h" // Raised by Process.wait(). diff --git a/psutil/arch/windows/process_handles.c b/psutil/arch/windows/proc_handles.c index 72e3f4d4..30e7cd2d 100644 --- a/psutil/arch/windows/process_handles.c +++ b/psutil/arch/windows/proc_handles.c @@ -23,7 +23,7 @@ #include <Python.h> #include "../../_psutil_common.h" -#include "process_utils.h" +#include "proc_utils.h" #define THREAD_TIMEOUT 100 // ms diff --git a/psutil/arch/windows/process_handles.h b/psutil/arch/windows/proc_handles.h index d1be3152..d1be3152 100644 --- a/psutil/arch/windows/process_handles.h +++ b/psutil/arch/windows/proc_handles.h diff --git a/psutil/arch/windows/process_info.c b/psutil/arch/windows/proc_info.c index 7a227d4d..5d16b813 100644 --- a/psutil/arch/windows/process_info.c +++ b/psutil/arch/windows/proc_info.c @@ -11,8 +11,8 @@ #include <windows.h> #include "../../_psutil_common.h" -#include "process_info.h" -#include "process_utils.h" +#include "proc_info.h" +#include "proc_utils.h" #ifndef _WIN64 diff --git a/psutil/arch/windows/process_info.h b/psutil/arch/windows/proc_info.h index b7795451..b7795451 100644 --- a/psutil/arch/windows/process_info.h +++ b/psutil/arch/windows/proc_info.h diff --git a/psutil/arch/windows/process_utils.c b/psutil/arch/windows/proc_utils.c index f9d4bbc8..dac1129c 100644 --- a/psutil/arch/windows/process_utils.c +++ b/psutil/arch/windows/proc_utils.c @@ -11,7 +11,7 @@ #include <Psapi.h> // EnumProcesses #include "../../_psutil_common.h" -#include "process_utils.h" +#include "proc_utils.h" DWORD * diff --git a/psutil/arch/windows/process_utils.h b/psutil/arch/windows/proc_utils.h index dca7c991..dca7c991 100644 --- a/psutil/arch/windows/process_utils.h +++ b/psutil/arch/windows/proc_utils.h diff --git a/psutil/arch/windows/socks.c b/psutil/arch/windows/socks.c index 5e4c2df8..0dc77f2d 100644 --- a/psutil/arch/windows/socks.c +++ b/psutil/arch/windows/socks.c @@ -12,7 +12,7 @@ #include <ws2tcpip.h> #include "../../_psutil_common.h" -#include "process_utils.h" +#include "proc_utils.h" #define BYTESWAP_USHORT(x) ((((USHORT)(x) << 8) | ((USHORT)(x) >> 8)) & 0xffff) |