diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-02 04:54:13 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-02 04:54:13 +0000 |
| commit | b8457edd8ab7eb6f16a0e4f0efb509ea07cba3ad (patch) | |
| tree | f91aab9a82185f02ad8a030ff1731e5f804c8ea0 /win32/win32.c | |
| parent | 103327b06c699ad445a77f2659c8dddf5c4feff8 (diff) | |
* win32/{setup.mak,Makefile.sub,win32.c} (RT_VER): split compiler
specification and runtime library specification.
* win32/Makefile.sub (LD_SHARED*, config.status): no need to embbed
manifest if not exist.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/win32/win32.c b/win32/win32.c index d7d72c332d..83d1964467 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -368,7 +368,7 @@ flock(int fd, int oper) static void init_stdhandle(void); -#if _MSC_VER >= 1400 +#if RT_VER >= 80 static void invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy) { @@ -476,7 +476,7 @@ init_env(void) void NtInitialize(int *argc, char ***argv) { -#if _MSC_VER >= 1400 +#if RT_VER >= 80 static void set_pioinfo_extra(void); _CrtSetReportMode(_CRT_ASSERT, 0); @@ -1754,7 +1754,7 @@ typedef struct { #ifdef MSVCRT_THREADS int lockinitflag; CRITICAL_SECTION lock; -#if _MSC_VER >= 1400 +#if RT_VER >= 80 char textmode; char pipech2[2]; #endif @@ -1776,7 +1776,7 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[]; #define _osfile(i) (_pioinfo(i)->osfile) #define _pipech(i) (_pioinfo(i)->pipech) -#if _MSC_VER >= 1400 +#if RT_VER >= 80 static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */ static void @@ -1929,9 +1929,6 @@ char * rb_w32_strerror(int e) { static char buffer[512]; -#if !defined __MINGW32__ - extern int sys_nerr; -#endif DWORD source = 0; char *p; |