diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-16 07:08:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-16 07:08:27 +0000 |
| commit | 72fffe5cee069d9f47a7a8dc808885aec67da225 (patch) | |
| tree | bcd5ba86235c47b1d0f10e8f36577dab7ae63d08 /win32 | |
| parent | 8b25f42046871e94a857dab5ecfb49a8d8fec4c1 (diff) | |
* configure.in (RUBY_MSVCRT_VERSION): define on mingw too.
* win32/Makefile.sub (config.h): prefix RT_VER with RUBY and make
more descriptive to get rid of potential conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | win32/win32.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0bfd05e857..33ea9835d1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -474,7 +474,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !if "$(ENABLE_WIN95)" == "yes" && "$(MACHINE)" == "x86" #define WIN95 1 !endif -#define RT_VER $(RT_VER) +#define RUBY_MSVCRT_VERSION $(RT_VER) #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/win32/win32.c b/win32/win32.c index 84c929d371..c114aa7660 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -598,7 +598,7 @@ init_func(void) static void init_stdhandle(void); -#if RT_VER >= 80 +#if RUBY_MSVCRT_VERSION >= 80 /* License: Ruby's */ static void invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy) @@ -732,7 +732,7 @@ socklist_delete(SOCKET *sockp, int *flagp) void rb_w32_sysinit(int *argc, char ***argv) { -#if RT_VER >= 80 +#if RUBY_MSVCRT_VERSION >= 80 static void set_pioinfo_extra(void); _CrtSetReportMode(_CRT_ASSERT, 0); @@ -2132,7 +2132,7 @@ typedef struct { int lockinitflag; CRITICAL_SECTION lock; #endif -#if RT_VER >= 80 +#if RUBY_MSVCRT_VERSION >= 80 char textmode; char pipech2[2]; #endif @@ -2153,7 +2153,7 @@ static inline ioinfo* _pioinfo(int); #define _osfile(i) (_pioinfo(i)->osfile) #define _pipech(i) (_pioinfo(i)->pipech) -#if RT_VER >= 80 +#if RUBY_MSVCRT_VERSION >= 80 static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */ /* License: Ruby's */ @@ -6208,7 +6208,7 @@ rb_w32_fsopen(const char *path, const char *mode, int shflags) } #endif -#if defined(_MSC_VER) && RT_VER <= 60 +#if defined(_MSC_VER) && RUBY_MSVCRT_VERSION <= 60 extern long _ftol(double); /* License: Ruby's */ long |