[前][次][番号順一覧][スレッド一覧]

ruby-changes:36404

From: usa <ko1@a...>
Date: Wed, 19 Nov 2014 04:51:26 +0900 (JST)
Subject: [ruby-changes:36404] usa:r48485 (trunk): * debug.c (set_debug_option): need the declaration.

usa	2014-11-19 04:51:14 +0900 (Wed, 19 Nov 2014)

  New Revision: 48485

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48485

  Log:
    * debug.c (set_debug_option): need the declaration.
    
    * debug.c (set_debug_option): use the same macro with the implementation
      at win32/win32.c.

  Modified files:
    trunk/ChangeLog
    trunk/debug.c
Index: debug.c
===================================================================
--- debug.c	(revision 48484)
+++ debug.c	(revision 48485)
@@ -140,6 +140,9 @@ ruby_debug_breakpoint(void) https://github.com/ruby/ruby/blob/trunk/debug.c#L140
 static void
 set_debug_option(const char *str, int len, void *arg)
 {
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+    extern int ruby_w32_rtc_error;
+#endif
 #define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
@@ -149,7 +152,7 @@ set_debug_option(const char *str, int le https://github.com/ruby/ruby/blob/trunk/debug.c#L152
     } while (0)
     SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
     SET_WHEN("core", ruby_enable_coredump, 1);
-#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
     SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
 #endif
     fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48484)
+++ ChangeLog	(revision 48485)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov 19 04:49:07 2014  NAKAMURA Usaku  <usa@r...>
+
+	* debug.c (set_debug_option): need the declaration.
+
+	* debug.c (set_debug_option): use the same macro with the implementation
+	  at win32/win32.c.
+
 Wed Nov 19 04:16:24 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (symbol_list): fix the node type of literal symbol list

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]