aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capture_opts.h2
-rw-r--r--dumpcap.c8
-rw-r--r--epan/prefs.c2
-rw-r--r--extcap.c22
-rw-r--r--ui/gtk/capture_if_dlg.c2
-rw-r--r--ui/gtk/tcp_graph.c2
-rw-r--r--wsutil/ws_mempbrk_sse42.c2
7 files changed, 20 insertions, 20 deletions
diff --git a/capture_opts.h b/capture_opts.h
index 4d99cc759c..58efc54ef0 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -212,7 +212,7 @@ typedef struct link_row_tag {
gint dlt;
} link_row;
-#ifdef WIN32
+#ifdef _WIN32
#define INVALID_EXTCAP_PID INVALID_HANDLE_VALUE
#else
#define INVALID_EXTCAP_PID (GPid)-1
diff --git a/dumpcap.c b/dumpcap.c
index de683346e6..06b76c41ca 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -2666,7 +2666,7 @@ capture_loop_open_input(capture_options *capture_opts, loop_data *ld,
/* XXX - opening Winsock on tshark? */
- /* Initialize Windows Socket if we are in a WIN32 OS
+ /* Initialize Windows Socket if we are in a Win32 OS
This needs to be done before querying the interface for network/netmask */
#ifdef _WIN32
/* XXX - do we really require 1.1 or earlier?
@@ -3574,7 +3574,7 @@ pcap_read_handler(void* arg)
static gboolean
capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct pcap_stat *stats)
{
-#ifdef WIN32
+#ifdef _WIN32
DWORD upd_time, cur_time; /* GetTickCount() returns a "DWORD" (which is 'unsigned long') */
#else
struct timeval upd_time, cur_time;
@@ -3710,7 +3710,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
}
/* init the time values */
-#ifdef WIN32
+#ifdef _WIN32
upd_time = GetTickCount();
#else
gettimeofday(&upd_time, NULL);
@@ -3812,7 +3812,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
*/
#define DUMPCAP_UPD_TIME 500
-#ifdef WIN32
+#ifdef _WIN32
cur_time = GetTickCount(); /* Note: wraps to 0 if sys runs for 49.7 days */
if ((cur_time - upd_time) > DUMPCAP_UPD_TIME) { /* wrap just causes an extra update */
#else
diff --git a/epan/prefs.c b/epan/prefs.c
index 7c5613940c..a9eef65aeb 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2074,7 +2074,7 @@ prefs_register_modules(void)
*/
prefs_register_enum_preference(gui_module, "console_open",
"Open a console window",
- "Open a console window (WIN32 only)",
+ "Open a console window (Windows only)",
(gint*)(void*)(&prefs.gui_console_open), gui_console_open_type, FALSE);
prefs_register_obsolete_preference(gui_module, "scrollbar_on_right");
diff --git a/extcap.c b/extcap.c
index 339021971b..92c3323461 100644
--- a/extcap.c
+++ b/extcap.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#include <process.h>
#include <time.h>
@@ -139,7 +139,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
const gchar *file;
gboolean keep_going;
gchar **argv;
-#ifdef WIN32
+#ifdef _WIN32
gchar **dll_search_envp;
gchar *progfile_dir;
#endif
@@ -148,7 +148,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
argv = (gchar **) g_malloc0(sizeof(gchar *) * (argc + 2));
-#ifdef WIN32
+#ifdef _WIN32
/*
* Make sure executables can find dependent DLLs and that they're *our*
* DLLs: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682586.aspx
@@ -162,7 +162,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
#endif
if ((dir = g_dir_open(dirname, 0, NULL)) != NULL) {
-#ifdef WIN32
+#ifdef _WIN32
dirname = g_strescape(dirname,NULL);
#endif
while (keep_going && (file = g_dir_read_name(dir)) != NULL ) {
@@ -177,7 +177,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
/* full path to extcap binary */
extcap_string = g_string_new("");
-#ifdef WIN32
+#ifdef _WIN32
g_string_printf(extcap_string, "%s\\\\%s",dirname,file);
extcap = g_string_free(extcap_string, FALSE);
envp = dll_search_envp;
@@ -207,7 +207,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb,
g_dir_close(dir);
}
-#ifdef WIN32
+#ifdef _WIN32
g_strfreev(dll_search_envp);
#endif
g_free(argv);
@@ -469,7 +469,7 @@ void extcap_cleanup(capture_options * capture_opts) {
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG,
"Extcap [%s] - Cleaning up fifo: %s; PID: %d", interface_opts.name,
interface_opts.extcap_fifo, interface_opts.extcap_pid);
-#ifdef WIN32
+#ifdef _WIN32
if (pipe_h)
{
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG,
@@ -500,7 +500,7 @@ void extcap_cleanup(capture_options * capture_opts) {
if (interface_opts.extcap_pid != INVALID_EXTCAP_PID)
{
-#ifdef WIN32
+#ifdef _WIN32
TerminateProcess(interface_opts.extcap_pid, 0);
#endif
g_spawn_close_pid(interface_opts.extcap_pid);
@@ -654,7 +654,7 @@ extcaps_init_initerfaces(capture_options *capture_opts)
capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, i);
g_array_insert_val(capture_opts->ifaces, i, interface_opts);
-#ifdef WIN32
+#ifdef _WIN32
/* On Windows, wait for extcap to connect to named pipe.
* Some extcaps will present UAC screen to user.
* 30 second timeout should be reasonable timeout for extcap to
@@ -727,7 +727,7 @@ extcaps_init_initerfaces(capture_options *capture_opts)
return TRUE;
}
-#ifdef WIN32
+#ifdef _WIN32
/* called by capture_sync to get the CreatNamedPipe handle*/
HANDLE
extcap_get_win32_handle()
@@ -738,7 +738,7 @@ extcap_get_win32_handle()
gboolean extcap_create_pipe(char ** fifo)
{
-#ifdef WIN32
+#ifdef _WIN32
gchar timestr[ 14+1 ];
time_t current_time;
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index c4d40e5936..ce4c6c5f03 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -424,7 +424,7 @@ GtkWidget * capture_get_if_icon(interface_t *device)
return pixbuf_to_widget(network_wired_pb_data);
#ifdef HAVE_EXTCAP
case IF_EXTCAP:
-#ifdef WIN32
+#ifdef _WIN32
if (strncmp(device->friendly_name, "USBPcap", 7) == 0) {
return pixbuf_to_widget(network_usb_pb_data);
}
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 3ed1f0e0c8..90cd68e361 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -470,7 +470,7 @@ static int rint(double ); /* compiler template for Windows */
static struct irect zoomrect;
/*
- * Uncomment the following define to revert WIN32 to
+ * Uncomment the following define to revert Windows to
* use original mouse button controls
*/
diff --git a/wsutil/ws_mempbrk_sse42.c b/wsutil/ws_mempbrk_sse42.c
index 80bf53d25f..7801e5c6cd 100644
--- a/wsutil/ws_mempbrk_sse42.c
+++ b/wsutil/ws_mempbrk_sse42.c
@@ -25,7 +25,7 @@
#include <glib.h>
#include "ws_cpuid.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <tmmintrin.h>
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 12:49:53 +0000