diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-09 18:54:54 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-10 01:56:27 +0000 |
| commit | a10a41f5c7816617aa6aa413c46c8eba625cccff (patch) | |
| tree | c7ff92d94bffa9cc9f55033cd99b3e6edfef5adc /wsutil | |
| parent | 55267bdbb091024cb9d29c829196506d2a67f7a6 (diff) | |
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')
| -rw-r--r-- | wsutil/Makefile.common | 2 | ||||
| -rw-r--r-- | wsutil/processes.h (renamed from wsutil/process.h) | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 60d843ab31..9507e3f146 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -107,7 +107,7 @@ libwsutil_nonrepl_INCLUDES = \ os_version_info.h \ plugins.h \ privileges.h \ - process.h \ + processes.h \ sha1.h \ sign_ext.h \ sober128.h \ diff --git a/wsutil/process.h b/wsutil/processes.h index 6747b7915c..ced8c1d71e 100644 --- a/wsutil/process.h +++ b/wsutil/processes.h @@ -1,4 +1,4 @@ -/* process.h +/* processes.h * Process utility definitions * * Wireshark - Network traffic analyzer @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _WSUTIL_PROCESS_H_ -#define _WSUTIL_PROCESS_H_ +#ifndef _WSUTIL_PROCESSES_H_ +#define _WSUTIL_PROCESSES_H_ #include "ws_symbol_export.h" @@ -41,4 +41,4 @@ typedef pid_t ws_process_id; /* on UN\*X, a process ID is a pid_t */ } #endif /* __cplusplus */ -#endif /* _WSUTIL_PROCESS_H_ */ +#endif /* _WSUTIL_PROCESSES_H_ */ |