Rename wsutil/process.h to wsutil/processes.h to avoid collisions.
authorGuy Harris <guy@alum.mit.edu>
Wed, 10 Jun 2015 01:54:54 +0000 (18:54 -0700)
committerGuy Harris <guy@alum.mit.edu>
Wed, 10 Jun 2015 01:56:27 +0000 (01:56 +0000)
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>
capchild/capture_session.h
ui/ui_util.h
wsutil/Makefile.common
wsutil/processes.h [moved from wsutil/process.h with 91% similarity]

index 4f0de81b0126650b99694a1c18dbfb43e1426262..d55ef1f768c0c8446d27c17f5b05df988a3d1e37 100644 (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 */
index 6f966361dc75c380d380c590d81393da6b045142..4fb6c0f63dda129d918ea2e9d0dbef72d3847e6a 100644 (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"
index 60d843ab31dd0472c34593e19d0e1d704c2628dc..9507e3f14697ac887bb3526a3b630e52731c4d8d 100644 (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      \
similarity index 91%
rename from wsutil/process.h
rename to wsutil/processes.h
index 6747b7915c6cd9c522e2c6293a8244403088f136..ced8c1d71e1d14dfff1c5029c06ebdd5448501ee 100644 (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_ */