kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (RUBY_MSVCRT_VERSION): define on mingw too.

Browse source 
* 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
This commit is contained in:
nobu 2012-04-16 07:08:27 +00:00
parent 8b25f42046
commit 72fffe5cee
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Apr 16 16:08:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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.
Mon Apr 16 15:19:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Apr 16 15:19:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (NO_RUBY_VENDOR_LIB): fix missing comma. * configure.in (NO_RUBY_VENDOR_LIB): fix missing comma.

3
configure.in
View file

@ -343,6 +343,9 @@ AS_CASE(["$target_os"],
sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`], sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
[rb_cv_msvcrt=msvcrt]) [rb_cv_msvcrt=msvcrt])
test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt]) test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
test "$RT_VER" = "" && RT_VER=60
AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
]) ])
: ${enable_shared=yes} : ${enable_shared=yes}
], ],

2
error.c
View file

@ -288,7 +288,7 @@ rb_bug(const char *fmt, ...)
report_bug(file, line, fmt, args); report_bug(file, line, fmt, args);
va_end(args); va_end(args);
#if defined(_WIN32) && defined(RT_VER) && RT_VER >= 80 #if defined(_WIN32) && defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 80
_set_abort_behavior( 0, _CALL_REPORTFAULT); _set_abort_behavior( 0, _CALL_REPORTFAULT);
#endif #endif

2
win32/Makefile.sub
View file

@ -474,7 +474,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
!if "$(ENABLE_WIN95)" == "yes" && "$(MACHINE)" == "x86" !if "$(ENABLE_WIN95)" == "yes" && "$(MACHINE)" == "x86"
#define WIN95 1 #define WIN95 1
!endif !endif
#define RT_VER $(RT_VER) #define RUBY_MSVCRT_VERSION $(RT_VER)
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1

10
win32/win32.c
View file

@ -598,7 +598,7 @@ init_func(void)
static void init_stdhandle(void); static void init_stdhandle(void);
#if RT_VER >= 80 #if RUBY_MSVCRT_VERSION >= 80
/* License: Ruby's */ /* License: Ruby's */
static void static void
invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy) 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 void
rb_w32_sysinit(int *argc, char ***argv) rb_w32_sysinit(int *argc, char ***argv)
{ {
#if RT_VER >= 80 #if RUBY_MSVCRT_VERSION >= 80
static void set_pioinfo_extra(void); static void set_pioinfo_extra(void);
_CrtSetReportMode(_CRT_ASSERT, 0); _CrtSetReportMode(_CRT_ASSERT, 0);
@ -2132,7 +2132,7 @@ typedef struct {
int lockinitflag; int lockinitflag;
CRITICAL_SECTION lock; CRITICAL_SECTION lock;
#endif #endif
#if RT_VER >= 80 #if RUBY_MSVCRT_VERSION >= 80
char textmode; char textmode;
char pipech2[2]; char pipech2[2];
#endif #endif
@ -2153,7 +2153,7 @@ static inline ioinfo* _pioinfo(int);
#define _osfile(i) (_pioinfo(i)->osfile) #define _osfile(i) (_pioinfo(i)->osfile)
#define _pipech(i) (_pioinfo(i)->pipech) #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 */ static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */
/* License: Ruby's */ /* License: Ruby's */
@ -6208,7 +6208,7 @@ rb_w32_fsopen(const char *path, const char *mode, int shflags)
} }
#endif #endif
#if defined(_MSC_VER) && RT_VER <= 60 #if defined(_MSC_VER) && RUBY_MSVCRT_VERSION <= 60
extern long _ftol(double); extern long _ftol(double);
/* License: Ruby's */ /* License: Ruby's */
long long