diff options
| author | Joe Poirier <jdpoirier@gmail.com> | 2011-02-08 15:42:52 -0500 |
|---|---|---|
| committer | Joe Poirier <jdpoirier@gmail.com> | 2011-02-08 15:42:52 -0500 |
| commit | cbb19ab4dfad38496ff3f86e1b55ce4fa79de441 (patch) | |
| tree | c22d10b5a24e720d5c497b646637f530dd5d0cc4 /include | |
| parent | a426882d50cf57d05a3b5629a658f5caa267ba21 (diff) | |
| download | go-cbb19ab4dfad38496ff3f86e1b55ce4fa79de441.tar.gz | |
windows: replace remaining __MINGW32__ instances with _WIN32
R=rsc, brainman
CC=golang-dev
http://codereview.appspot.com/4146041
Committer: Russ Cox <rsc@golang.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc.h | 2 | ||||
| -rw-r--r-- | include/u.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/libc.h b/include/libc.h index 1103bcf81..a91039dbf 100644 --- a/include/libc.h +++ b/include/libc.h @@ -291,7 +291,7 @@ extern char* getgoarch(void); extern char* getgoroot(void); extern char* getgoversion(void); -#ifdef __MINGW32__ +#ifdef _WIN32 struct timespec { int tv_sec; long tv_nsec; diff --git a/include/u.h b/include/u.h index 3cc1f335c..690b2f616 100644 --- a/include/u.h +++ b/include/u.h @@ -78,7 +78,7 @@ extern "C" { #define _NEEDUINT 1 #define _NEEDULONG 1 -#ifdef __MINGW32__ +#ifdef _WIN32 typedef jmp_buf sigjmp_buf; #endif typedef long p9jmp_buf[sizeof(sigjmp_buf)/sizeof(long)]; @@ -139,7 +139,7 @@ typedef long p9jmp_buf[sizeof(sigjmp_buf)/sizeof(long)]; # undef _NEEDUSHORT # undef _NEEDUINT # undef _NEEDULONG -#elif defined(__MINGW32__) +#elif defined(_WIN32) #else /* No idea what system this is -- try some defaults */ # include <pthread.h> @@ -208,7 +208,7 @@ typedef u64int uint64; */ #if defined(__GNUC__) # undef strcmp /* causes way too many warnings */ -# if __GNUC__ >= 4 || (__GNUC__==3 && !defined(__APPLE_CC__) && !defined(__MINGW32__)) +# if __GNUC__ >= 4 || (__GNUC__==3 && !defined(__APPLE_CC__) && !defined(_WIN32)) # undef AUTOLIB # define AUTOLIB(x) int __p9l_autolib_ ## x __attribute__ ((weak)); # undef AUTOFRAMEWORK |