diff options
| author | Joe Poirier <jdpoirier@gmail.com> | 2010-09-08 22:20:35 -0400 |
|---|---|---|
| committer | Joe Poirier <jdpoirier@gmail.com> | 2010-09-08 22:20:35 -0400 |
| commit | a9c5a56d466e65b772c2284803646f54b27348ad (patch) | |
| tree | 25424241a09185f37e639ccca19fe5d89f92ff73 | |
| parent | 9fbc3d5a2d06801bda4848c9e8d3d04ff10ed821 (diff) | |
| download | go-a9c5a56d466e65b772c2284803646f54b27348ad.tar.gz | |
build: test for _WIN32, not _MINGW32
Use OS rather than compiler specific flag the same way that
__FreeBSD__, __APPLE__, __OpenBSD__, and __linux__ are used.
_WIN32 is defined by GCC (and others) on windows for Win32
and Win64 applications. _WIN32 is set by default for several
other windows based compilers: DMC, MSVC, Intel, Watcom, LCC.
Although the change is for consistency, it allows the Go tools
to be compiled with non-Mingw GCC distributions and non-GCC
compilers that support the GCC extensions.
R=rsc, brainman, vcc
CC=golang-dev
http://codereview.appspot.com/2168043
Committer: Russ Cox <rsc@golang.org>
| -rw-r--r-- | src/cmd/cc/lex.c | 2 | ||||
| -rw-r--r-- | src/cmd/godefs/main.c | 2 | ||||
| -rw-r--r-- | src/lib9/dirfwstat.c | 2 | ||||
| -rw-r--r-- | src/lib9/dirstat.c | 2 | ||||
| -rw-r--r-- | src/lib9/time.c | 4 | ||||
| -rw-r--r-- | src/libbio/bseek.c | 2 | ||||
| -rwxr-xr-x | src/libcgo/386.S | 2 | ||||
| -rw-r--r-- | src/libcgo/amd64.S | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c index c9facc667..fd74edb9d 100644 --- a/src/cmd/cc/lex.c +++ b/src/cmd/cc/lex.c @@ -38,7 +38,7 @@ int systemtype(int sys) { -#ifdef __MINGW32__ +#ifdef _WIN32 return sys&Windows; #else return sys&Plan9; diff --git a/src/cmd/godefs/main.c b/src/cmd/godefs/main.c index 6ff542f48..d31d298a5 100644 --- a/src/cmd/godefs/main.c +++ b/src/cmd/godefs/main.c @@ -82,7 +82,7 @@ #include "a.h" -#ifdef __MINGW32__ +#ifdef _WIN32 int spawn(char *prog, char **argv) { diff --git a/src/lib9/dirfwstat.c b/src/lib9/dirfwstat.c index 15f1c1252..fe9153b9b 100644 --- a/src/lib9/dirfwstat.c +++ b/src/lib9/dirfwstat.c @@ -61,7 +61,7 @@ dirfwstat(int fd, Dir *dir) struct timeval tv[2]; ret = 0; -#ifndef __MINGW32__ +#ifndef _WIN32 if(~dir->mode != 0){ if(fchmod(fd, dir->mode) < 0) ret = -1; diff --git a/src/lib9/dirstat.c b/src/lib9/dirstat.c index 6c476753b..6d804ca7c 100644 --- a/src/lib9/dirstat.c +++ b/src/lib9/dirstat.c @@ -39,7 +39,7 @@ dirstat(char *file) Dir *d; char *str; -#ifdef __MINGW32__ +#ifdef _WIN32 if(stat(file, &st) < 0) return nil; lst = st; diff --git a/src/lib9/time.c b/src/lib9/time.c index 720dd702e..7394e9e60 100644 --- a/src/lib9/time.c +++ b/src/lib9/time.c @@ -25,7 +25,7 @@ THE SOFTWARE. #include <u.h> #include <sys/time.h> #include <time.h> -#ifndef __MINGW32__ +#ifndef _WIN32 #include <sys/resource.h> #endif #define NOPLAN9DEFINES @@ -34,7 +34,7 @@ THE SOFTWARE. long p9times(long *t) { -#ifdef __MINGW32__ +#ifdef _WIN32 memset(t, 0, 4*sizeof(long)); #else struct rusage ru, cru; diff --git a/src/libbio/bseek.c b/src/libbio/bseek.c index be00ab1a7..291498108 100644 --- a/src/libbio/bseek.c +++ b/src/libbio/bseek.c @@ -33,7 +33,7 @@ Bseek(Biobuf *bp, vlong offset, int base) vlong n, d; int bufsz; -#ifndef __MINGW32__ +#ifndef _WIN32 if(sizeof(offset) != sizeof(off_t)) { fprint(2, "Bseek: libbio compiled with %d-byte offset\n", sizeof(off_t)); abort(); diff --git a/src/libcgo/386.S b/src/libcgo/386.S index cca79cdd5..02cbe3453 100755 --- a/src/libcgo/386.S +++ b/src/libcgo/386.S @@ -5,7 +5,7 @@ /* * Apple still insists on underscore prefixes for C function names. */ -#if defined(__APPLE__) || defined(__MINGW32__) +#if defined(__APPLE__) || defined(_WIN32) #define EXT(s) _##s #else #define EXT(s) s diff --git a/src/libcgo/amd64.S b/src/libcgo/amd64.S index 178c33cde..083c2bc94 100644 --- a/src/libcgo/amd64.S +++ b/src/libcgo/amd64.S @@ -5,7 +5,7 @@ /* * Apple still insists on underscore prefixes for C function names. */ -#if defined(__APPLE__) || defined(__MINGW64__) +#if defined(__APPLE__) || defined(_WIN32) #define EXT(s) _##s #else #define EXT(s) s |