diff options
| author | Guy Harris <gharris@sonic.net> | 2021-03-16 04:33:00 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-03-16 04:33:00 -0700 |
| commit | e434d404d0db719440cc911729d225417a49b4f4 (patch) | |
| tree | d74e39abf82d29dbed78ec8d109dc0e4e0c4e138 /wsutil/processes.h | |
| parent | 1e1f4e6b5f9a309cef55d4459c8bba40d6acc104 (diff) | |
Move even more headers outside extern "C".
If a header declares a function, or anything else requiring the extern
"C" decoration, have it wrap the declaration itself; don't rely on the
header itself being included inside extern "C".
Diffstat (limited to 'wsutil/processes.h')
| -rw-r--r-- | wsutil/processes.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/wsutil/processes.h b/wsutil/processes.h index 03c76e829d..6d19f97548 100644 --- a/wsutil/processes.h +++ b/wsutil/processes.h @@ -13,6 +13,20 @@ #include "ws_symbol_export.h" +#ifdef _WIN32 +/* + * On Windows, a process ID is a HANDLE. + * Include <windows.h> to make sure HANDLE is defined. + */ +#include <windows.h> +#else +/* + * On UN*X, a process ID is a pid_t. + * Include <sys/types.h> to make sure pid_t is defined. + */ +#include <sys/types.h> +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -20,20 +34,15 @@ extern "C" { #ifdef _WIN32 /* * On Windows, a process ID is a HANDLE. - * Include <windows.h> to make sure HANDLE is defined. */ -#include <windows.h> - typedef HANDLE ws_process_id; #define WS_INVALID_PID INVALID_HANDLE_VALUE + #else /* * On UN*X, a process ID is a pid_t. - * Include <sys/types.h> to make sure pid_t is defined. */ -#include <sys/types.h> - typedef pid_t ws_process_id; #define WS_INVALID_PID -1 |