diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-06-03 16:07:07 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-06-03 16:07:07 +0000 |
| commit | a6dab6d6447509270ccb10281f155e6b804a8b25 (patch) | |
| tree | beeb322d6a999808d1f807eb5fcd42ea8b6786d3 /epan | |
| parent | ff26c88dcacb69d7a294d920a5e02199b2bbaa84 (diff) | |
(Minor) Use _WIN32 (instead of WIN32) like the rest of Wireshark
svn path=/trunk/; revision=22030
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/addr_resolv.c | 10 | ||||
| -rw-r--r-- | epan/crypt/airpdcap_interop.h | 2 | ||||
| -rw-r--r-- | epan/filesystem.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 85d2f02b05..1ba17a55c8 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1624,11 +1624,11 @@ host_name_lookup_init(void) { char *hostspath; #ifdef HAVE_GNU_ADNS -#ifdef WIN32 +#ifdef _WIN32 char *sysroot; static char rootpath_nt[] = "\\system32\\drivers\\etc\\hosts"; static char rootpath_ot[] = "\\hosts"; -#endif /* WIN32 */ +#endif /* _WIN32 */ #endif /*GNU_ADNS */ /* @@ -1654,7 +1654,7 @@ host_name_lookup_init(void) { * We're using GNU ADNS, which doesn't check the system hosts file; * we load that file ourselves. */ -#ifdef WIN32 +#ifdef _WIN32 sysroot = getenv_utf8("WINDIR"); if (sysroot != NULL) { @@ -1675,9 +1675,9 @@ host_name_lookup_init(void) { } g_free(hostspath); } -#else /* WIN32 */ +#else /* _WIN32 */ read_hosts_file("/etc/hosts"); -#endif /* WIN32 */ +#endif /* _WIN32 */ /* XXX - Any flags we should be using? */ /* XXX - We could provide config settings for DNS servers, and diff --git a/epan/crypt/airpdcap_interop.h b/epan/crypt/airpdcap_interop.h index 3a65ee8bca..774b663dec 100644 --- a/epan/crypt/airpdcap_interop.h +++ b/epan/crypt/airpdcap_interop.h @@ -85,7 +85,7 @@ typedef gchar CHAR; typedef guchar UCHAR; #endif -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> /* ntohs() */ #endif diff --git a/epan/filesystem.c b/epan/filesystem.c index 21c55658ea..98aec53936 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -738,7 +738,7 @@ get_systemfile_dir(void) #define PF_DIR ".wireshark" #endif -#ifdef WIN32 +#ifdef _WIN32 /* utf8 version of getenv, needed to get win32 filename paths */ char *getenv_utf8(const char *varname) { |