summaryrefslogtreecommitdiff
path: root/wsutil/processes.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-06-09 18:54:54 -0700
committerGuy Harris <guy@alum.mit.edu>2015-06-10 01:56:27 +0000
commita10a41f5c7816617aa6aa413c46c8eba625cccff (patch)
treec7ff92d94bffa9cc9f55033cd99b3e6edfef5adc /wsutil/processes.h
parent55267bdbb091024cb9d29c829196506d2a67f7a6 (diff)
downloadwireshark-a10a41f5c7816617aa6aa413c46c8eba625cccff.tar.gz
Rename wsutil/process.h to wsutil/processes.h to avoid collisions.
The MSVC rules for searching for headers are a huge barrel of fun; it appears that, for some files that need the MSVC <process.h> to declare getpid(), they're getting our <wsutil/process.h> instead, as that's in the current directory. Rename it to avoid the collision. Change-Id: I88eb70237062fa7957e38d7ff8132524390a6a5c Reviewed-on: https://code.wireshark.org/review/8870 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/processes.h')
-rw-r--r--wsutil/processes.h44
1 files changed, 44 insertions, 0 deletions
diff --git a/wsutil/processes.h b/wsutil/processes.h
new file mode 100644
index 0000000000..ced8c1d71e
--- /dev/null
+++ b/wsutil/processes.h
@@ -0,0 +1,44 @@
+/* processes.h
+ * Process utility definitions
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _WSUTIL_PROCESSES_H_
+#define _WSUTIL_PROCESSES_H_
+
+#include "ws_symbol_export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef _WIN32
+#include <windows.h>
+
+typedef HANDLE ws_process_id; /* on Windows, a process ID is a HANDLE */
+#else
+typedef pid_t ws_process_id; /* on UN\*X, a process ID is a pid_t */
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _WSUTIL_PROCESSES_H_ */