osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Windows: Don't define or check for WIN32. 

_WIN32 is defined by the compiler, and is arguably a more reliable
test that WIN32. Switch to checking for _WIN32 in a couple of places in
the code.

Remove a WIN32 definition from config.h. It was added for the WinPcap
developer pack but we no longer use that.
This commit is contained in:
Gerald Combs 2022-08-04 11:23:59 -07:00 committed by A Wireshark GitLab Utility
parent a0d03745a9
commit 74e0b506be
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmakeconfig.h.in
View File

@ -316,11 +316,6 @@
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
/* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */
# ifndef WIN32
# define WIN32 1
# endif
/* /*
* Flex (v 2.5.35) uses this symbol to "exclude" unistd.h * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
*/ */

2
speexdsp/stack_alloc.h
View File

@ -36,7 +36,7 @@
#define STACK_ALLOC_H #define STACK_ALLOC_H
#ifdef USE_ALLOCA #ifdef USE_ALLOCA
# ifdef WIN32 # ifdef _WIN32
# include <malloc.h> # include <malloc.h>
# else # else
# ifdef HAVE_ALLOCA_H # ifdef HAVE_ALLOCA_H

4
ui/help_url.c
View File

@ -31,7 +31,7 @@ gchar *
user_guide_url(const gchar *page) { user_guide_url(const gchar *page) {
GString *url = g_string_new(""); GString *url = g_string_new("");
#if defined(WIN32) #if defined(_WIN32)
/* /*
* The User's Guide is in a directory named "Wireshark User's Guide" in * The User's Guide is in a directory named "Wireshark User's Guide" in
* the program directory. * the program directory.
@ -48,7 +48,7 @@ user_guide_url(const gchar *page) {
/* try to open the HTML page from wireshark.org instead */ /* try to open the HTML page from wireshark.org instead */
g_string_printf(url, "file://" DOC_DIR "/guides/wsug_html_chunked/%s", page); g_string_printf(url, "file://" DOC_DIR "/guides/wsug_html_chunked/%s", page);
} }
#endif /* WIN32 / DOC_DIR */ #endif /* _WIN32 / DOC_DIR */
/* Fall back to wireshark.org. */ /* Fall back to wireshark.org. */