diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-08-31 14:39:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-08-31 14:39:23 -0700 |
| commit | 5ff25beec7ad7fb229b943ecb86fe55bcad531c4 (patch) | |
| tree | 0c9dc7ea5723347abf7836b66695804a0f3ac546 /scanner.l | |
| parent | 1a44e70c2d2b754b3f92c66a0a590f6fdc347566 (diff) | |
The official #define for 32-bit and 64-bit Windows is _WIN32.
It's _WIN32, with a leading underscore, not WIN32. See, for example:
https://sourceforge.net/p/predef/wiki/OperatingSystems/
and
https://msdn.microsoft.com/en-us/library/b0084kay.aspx
*Some* environments may also define WIN32, but we shouldn't depend on
that.
Diffstat (limited to 'scanner.l')
| -rw-r--r-- | scanner.l | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -20,9 +20,9 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifdef WIN32 +#ifdef _WIN32 #include <pcap-stdinc.h> -#else /* WIN32 */ +#else /* _WIN32 */ #if HAVE_INTTYPES_H #include <inttypes.h> #elif HAVE_STDINT_H @@ -32,7 +32,7 @@ #include <sys/bitypes.h> #endif #include <sys/types.h> -#endif /* WIN32 */ +#endif /* _WIN32 */ #include <ctype.h> #include <string.h> @@ -41,16 +41,16 @@ #include "gencode.h" #ifdef INET6 -#ifdef WIN32 +#ifdef _WIN32 #include <pcap-stdinc.h> #ifdef __MINGW32__ #include "ip6_misc.h" #endif -#else /* WIN32 */ +#else /* _WIN32 */ #include <sys/socket.h> /* for "struct sockaddr" in "struct addrinfo" */ #include <netdb.h> /* for "struct addrinfo" */ -#endif /* WIN32 */ +#endif /* _WIN32 */ /* Workaround for AIX 4.3 */ #if !defined(AI_NUMERICHOST) |