diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-31 10:59:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-31 15:48:47 -0500 |
| commit | 5cf9167f919dfef964b1d149731ed04941e25ebf (patch) | |
| tree | 37668dde9fd4c68d80cb1bde90523b55fba4b226 /src/common/procmon.c | |
| parent | 23054543278a8ee5db6d8dae3b3a96e2b2fd5377 (diff) | |
| download | tor-5cf9167f919dfef964b1d149731ed04941e25ebf.tar tor-5cf9167f919dfef964b1d149731ed04941e25ebf.tar.gz | |
Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32
This commit is completely mechanical; I used this perl script to make it:
#!/usr/bin/perl -w -i.bak -p
if (/^\s*\#/) {
s/MS_WINDOWS/_WIN32/g;
s/\bWIN32\b/_WIN32/g;
}
Diffstat (limited to 'src/common/procmon.c')
| -rw-r--r-- | src/common/procmon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/procmon.c b/src/common/procmon.c index 5c10e9a22..85d2a2fe3 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -21,7 +21,7 @@ #include <errno.h> #endif -#ifdef MS_WINDOWS +#ifdef _WIN32 #include <windows.h> /* Windows does not define pid_t, but _getpid() returns an int. */ @@ -91,7 +91,7 @@ struct tor_process_monitor_t { * polls. */ pid_t pid; -#ifdef MS_WINDOWS +#ifdef _WIN32 /** Windows-only: Should we poll hproc? If false, poll pid * instead. */ int poll_hproc; @@ -192,7 +192,7 @@ tor_process_monitor_new(struct event_base *base, procmon->pid = ppspec.pid; -#ifdef MS_WINDOWS +#ifdef _WIN32 procmon->hproc = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, procmon->pid); @@ -246,7 +246,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, tor_assert(procmon != NULL); -#ifdef MS_WINDOWS +#ifdef _WIN32 if (procmon->poll_hproc) { DWORD exit_code; if (!GetExitCodeProcess(procmon->hproc, &exit_code)) { @@ -323,7 +323,7 @@ tor_process_monitor_free(tor_process_monitor_t *procmon) if (procmon == NULL) return; -#ifdef MS_WINDOWS +#ifdef _WIN32 if (procmon->hproc != NULL) CloseHandle(procmon->hproc); #endif |