diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-01 05:19:19 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-01 05:19:19 +0000 |
| commit | 1ed0b7a37a1661082cb3ed846c75b3fdbb8033ee (patch) | |
| tree | f8d32f49ec8f7c54b04475db9e66cc9128fd7e7e /win32/win32.c | |
| parent | bc48cbb00c5221ddae8f7500242fa047634c298b (diff) | |
| download | ruby-1ed0b7a37a1661082cb3ed846c75b3fdbb8033ee.tar.gz ruby-1ed0b7a37a1661082cb3ed846c75b3fdbb8033ee.tar.xz ruby-1ed0b7a37a1661082cb3ed846c75b3fdbb8033ee.zip | |
* win32/{setup.mak,Makefile.sub,win32.c},include/ruby/win32.h (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: http://svn.ruby-lang.org/repos/ruby/trunk@25173 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 d832ef3d6..f24a6ab2d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -501,7 +501,7 @@ init_func(void) 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) { @@ -575,7 +575,7 @@ StartSockets(void) void rb_w32_sysinit(int *argc, char ***argv) { -#if _MSC_VER >= 1400 +#if RT_VER >= 80 static void set_pioinfo_extra(void); _CrtSetReportMode(_CRT_ASSERT, 0); @@ -1882,7 +1882,7 @@ typedef struct { int lockinitflag; CRITICAL_SECTION lock; #endif -#if _MSC_VER >= 1400 +#if RT_VER >= 80 char textmode; char pipech2[2]; #endif @@ -1903,7 +1903,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 @@ -2065,9 +2065,6 @@ char * rb_w32_strerror(int e) { static char buffer[512]; -#if !defined __MINGW32__ - extern int sys_nerr; -#endif DWORD source = 0; char *p; |