mirror of
https://github.com/golang/go
synced 2024-11-24 15:10:02 -07:00
windows: replace remaining __MINGW32__ instances with _WIN32
R=rsc, brainman CC=golang-dev https://golang.org/cl/4146041
This commit is contained in:
parent
69334ee62b
commit
bf3f768955
@ -291,7 +291,7 @@ extern char* getgoarch(void);
|
|||||||
extern char* getgoroot(void);
|
extern char* getgoroot(void);
|
||||||
extern char* getgoversion(void);
|
extern char* getgoversion(void);
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef _WIN32
|
||||||
struct timespec {
|
struct timespec {
|
||||||
int tv_sec;
|
int tv_sec;
|
||||||
long tv_nsec;
|
long tv_nsec;
|
||||||
|
@ -78,7 +78,7 @@ extern "C" {
|
|||||||
#define _NEEDUINT 1
|
#define _NEEDUINT 1
|
||||||
#define _NEEDULONG 1
|
#define _NEEDULONG 1
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef _WIN32
|
||||||
typedef jmp_buf sigjmp_buf;
|
typedef jmp_buf sigjmp_buf;
|
||||||
#endif
|
#endif
|
||||||
typedef long p9jmp_buf[sizeof(sigjmp_buf)/sizeof(long)];
|
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 _NEEDUSHORT
|
||||||
# undef _NEEDUINT
|
# undef _NEEDUINT
|
||||||
# undef _NEEDULONG
|
# undef _NEEDULONG
|
||||||
#elif defined(__MINGW32__)
|
#elif defined(_WIN32)
|
||||||
#else
|
#else
|
||||||
/* No idea what system this is -- try some defaults */
|
/* No idea what system this is -- try some defaults */
|
||||||
# include <pthread.h>
|
# include <pthread.h>
|
||||||
@ -208,7 +208,7 @@ typedef u64int uint64;
|
|||||||
*/
|
*/
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
# undef strcmp /* causes way too many warnings */
|
# 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
|
# undef AUTOLIB
|
||||||
# define AUTOLIB(x) int __p9l_autolib_ ## x __attribute__ ((weak));
|
# define AUTOLIB(x) int __p9l_autolib_ ## x __attribute__ ((weak));
|
||||||
# undef AUTOFRAMEWORK
|
# undef AUTOFRAMEWORK
|
||||||
|
Loading…
Reference in New Issue
Block a user