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

ruby-changes:7472

From: nobu <ko1@a...>
Date: Sun, 31 Aug 2008 17:53:13 +0900 (JST)
Subject: [ruby-changes:7472] Ruby:r18991 (ruby_1_8, trunk): * lib/mkmf.rb (try_func, try_var, have_struct_member),

nobu	2008-08-31 17:52:56 +0900 (Sun, 31 Aug 2008)

  New Revision: 18991

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

  Log:
    * lib/mkmf.rb (try_func, try_var, have_struct_member),
      (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING.
    
    * lib/mkmf.rb (MAIN_DOES_NOTHING): defaults to ordinary main.
    
    * win32/Makefile.sub (config): for MAIN_DOES_NOTHING for wince.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/win32/Makefile.sub
    trunk/ChangeLog
    trunk/lib/mkmf.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18990)
+++ ChangeLog	(revision 18991)
@@ -1,3 +1,12 @@
+Sun Aug 31 17:52:45 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_func, try_var, have_struct_member),
+	  (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING.
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): defaults to ordinary main.
+
+	* win32/Makefile.sub (config): for MAIN_DOES_NOTHING for wince.
+
 Sun Aug 31 17:30:35 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* spec/README (How to run): added.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 18990)
+++ lib/mkmf.rb	(revision 18991)
@@ -506,12 +506,12 @@
 #{COMMON_HEADERS}
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { #{func}(); return 0; }
 SRC
 end
@@ -522,7 +522,7 @@
 #{COMMON_HEADERS}
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
 SRC
 end
@@ -840,7 +840,7 @@
 #{COMMON_HEADERS}
 #{cpp_include(headers)}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
 SRC
       $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
@@ -978,7 +978,7 @@
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
@@ -991,7 +991,7 @@
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
@@ -1875,6 +1875,7 @@
 LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
 RPATHFLAG = config_string('RPATHFLAG') || ''
 LIBARG = config_string('LIBARG') || '-l%s'
+MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;}'
 
 sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if sep != "/"} || ""
 CLEANINGS = "
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 18990)
+++ win32/Makefile.sub	(revision 18991)
@@ -523,6 +523,9 @@
 	@exit <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+!if defined(WIN32_WCE)
+s,@MAIN_DOES_NOTHING@,int WinMain(HINSTANCE h, HINSTANCE hp, LPWSTR s, int n) {return 0;},;t t
+!endif
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18990)
+++ ruby_1_8/ChangeLog	(revision 18991)
@@ -1,3 +1,12 @@
+Sun Aug 31 17:52:45 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_func, try_var, have_struct_member),
+	  (scalar_ptr_type?, scalar_type?): use MAIN_DOES_NOTHING.
+
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): defaults to ordinary main.
+
+	* win32/Makefile.sub (config): for MAIN_DOES_NOTHING for wince.
+
 Sun Aug 31 13:45:41 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 18990)
+++ ruby_1_8/lib/mkmf.rb	(revision 18991)
@@ -466,12 +466,12 @@
 #{COMMON_HEADERS}
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { #{func}(); return 0; }
 SRC
 end
@@ -482,7 +482,7 @@
 #{COMMON_HEADERS}
 #{headers}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
 SRC
 end
@@ -797,7 +797,7 @@
 #{COMMON_HEADERS}
 #{cpp_include(headers)}
 /*top*/
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
 SRC
       $defs.push(format("-DHAVE_ST_%s", member.tr_cpp))
@@ -934,7 +934,7 @@
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
@@ -947,7 +947,7 @@
 #{cpp_include(headers)}
 /*top*/
 volatile #{type} conftestval;
-int main() { return 0; }
+#{MAIN_DOES_NOTHING}
 int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
 SRC
 end
@@ -1798,6 +1798,7 @@
 LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
 RPATHFLAG = config_string('RPATHFLAG') || ''
 LIBARG = config_string('LIBARG') || '-l%s'
+MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0;}'
 
 sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
 CLEANINGS = "
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 18990)
+++ ruby_1_8/win32/Makefile.sub	(revision 18991)
@@ -446,6 +446,9 @@
 	@exit <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+!if defined(WIN32_WCE)
+s,@MAIN_DOES_NOTHING@,int WinMain(HINSTANCE h, HINSTANCE hp, LPWSTR s, int n) {return 0;},;t t
+!endif
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t

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

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