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>
This commit is contained in:
Guy Harris 2015-06-09 18:54:54 -07:00
parent 55267bdbb0
commit a10a41f5c7
4 changed files with 7 additions and 7 deletions

View File

@ -34,7 +34,7 @@ extern "C" {
#include "capture_opts.h"
#include <wsutil/process.h>
#include <wsutil/processes.h>
#ifdef HAVE_LIBPCAP
/* Current state of capture engine. XXX - differentiate states */

View File

@ -27,7 +27,7 @@
#include <stdint.h>
#include <wsutil/process.h>
#include <wsutil/processes.h>
#include "epan/packet_info.h"
#include "epan/column-utils.h"

View File

@ -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 \

View File

@ -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_ */