qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 10:50:13 -07:00
Code Releases Activity

build: test for _WIN32, not _MINGW32

Browse Source 
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
https://golang.org/cl/2168043
This commit is contained in:
Joe Poirier 2010-09-08 22:20:35 -04:00 committed by Russ Cox
parent fce222a95b
commit e21b3a40ac
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/cc/lex.c
View File

@ -38,7 +38,7 @@
int int
systemtype(int sys) systemtype(int sys)
{ {
#ifdef __MINGW32__ #ifdef _WIN32
return sys&Windows; return sys&Windows;
#else #else
return sys&Plan9; return sys&Plan9;

2
src/cmd/godefs/main.c
View File

@ -82,7 +82,7 @@
#include "a.h" #include "a.h"
#ifdef __MINGW32__ #ifdef _WIN32
int int
spawn(char *prog, char **argv) spawn(char *prog, char **argv)
{ {

2
src/lib9/dirfwstat.c
View File

@ -61,7 +61,7 @@ dirfwstat(int fd, Dir *dir)
struct timeval tv[2]; struct timeval tv[2];
ret = 0; ret = 0;
#ifndef __MINGW32__ #ifndef _WIN32
if(~dir->mode != 0){ if(~dir->mode != 0){
if(fchmod(fd, dir->mode) < 0) if(fchmod(fd, dir->mode) < 0)
ret = -1; ret = -1;

2
src/lib9/dirstat.c
View File

@ -39,7 +39,7 @@ dirstat(char *file)
Dir *d; Dir *d;
char *str; char *str;
#ifdef __MINGW32__ #ifdef _WIN32
if(stat(file, &st) < 0) if(stat(file, &st) < 0)
return nil; return nil;
lst = st; lst = st;

4
src/lib9/time.c
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#include <u.h> #include <u.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#ifndef __MINGW32__ #ifndef _WIN32
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#define NOPLAN9DEFINES #define NOPLAN9DEFINES
@ -34,7 +34,7 @@ THE SOFTWARE.
long long
p9times(long *t) p9times(long *t)
{ {
#ifdef __MINGW32__ #ifdef _WIN32
memset(t, 0, 4*sizeof(long)); memset(t, 0, 4*sizeof(long));
#else #else
struct rusage ru, cru; struct rusage ru, cru;

2
src/libbio/bseek.c
View File

@ -33,7 +33,7 @@ Bseek(Biobuf *bp, vlong offset, int base)
vlong n, d; vlong n, d;
int bufsz; int bufsz;
#ifndef __MINGW32__ #ifndef _WIN32
if(sizeof(offset) != sizeof(off_t)) { if(sizeof(offset) != sizeof(off_t)) {
fprint(2, "Bseek: libbio compiled with %d-byte offset\n", sizeof(off_t)); fprint(2, "Bseek: libbio compiled with %d-byte offset\n", sizeof(off_t));
abort(); abort();

2
src/libcgo/386.S
View File

@ -5,7 +5,7 @@
/* /*
* Apple still insists on underscore prefixes for C function names. * Apple still insists on underscore prefixes for C function names.
*/ */
#if defined(__APPLE__) || defined(__MINGW32__) #if defined(__APPLE__) || defined(_WIN32)
#define EXT(s) _##s #define EXT(s) _##s
#else #else
#define EXT(s) s #define EXT(s) s

2
src/libcgo/amd64.S
View File

@ -5,7 +5,7 @@
/* /*
* Apple still insists on underscore prefixes for C function names. * Apple still insists on underscore prefixes for C function names.
*/ */
#if defined(__APPLE__) || defined(__MINGW64__) #if defined(__APPLE__) || defined(_WIN32)
#define EXT(s) _##s #define EXT(s) _##s
#else #else
#define EXT(s) s #define EXT(s) s