File ruby-18svn-r18459.patch of Package ruby

Overview Repositories Revisions Requests Users Attributes Meta

File ruby-18svn-r18459.patch of Package ruby

Sun Aug 10 08:15:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>

* configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert),
	  ext/digest/md5/md5.c, ext/openssl/ossl.c (main),
	  ext/socket/extconf.rb (ipv6, wide-getaddrinfo): main should be int.

* main.c (main), win32/winmain.c, wince/wincemain.c (WinMain): envp is
	  no longer used so long time.  based on a patch from Peter Bowen at
	  [ruby-core:18208]

Index: ext/digest/md5/md5.c
===================================================================
--- ext/digest/md5/md5.c	(revision 18458)
+++ ext/digest/md5/md5.c	(revision 18459)
@@ -60,6 +60,7 @@
  * A.5 of RFC 1321, reproduced below.
  */
 #include <string.h>
+int
 main()
 {
     static const char *const test[7*2] = {
@@ -100,6 +101,7 @@
  */
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
+int
 main()
 {
     int i;
Index: ext/openssl/ossl.c
===================================================================
--- ext/openssl/ossl.c	(revision 18458)
+++ ext/openssl/ossl.c	(revision 18459)
@@ -488,7 +488,7 @@
  * Check if all symbols are OK with 'make LDSHARED=gcc all'
  */
 int
-main(int argc, char *argv[], char *env[])
+main(int argc, char *argv[])
 {
     return 0;
 }
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 18458)
+++ ext/socket/extconf.rb	(revision 18459)
@@ -43,6 +43,7 @@
   if checking_for("ipv6") {try_link(<<EOF)}
 #include <sys/types.h>
 #include <sys/socket.h>
+int
 main()
 {
   socket(AF_INET6, SOCK_STREAM, 0);
@@ -135,6 +136,7 @@
 #define AF_LOCAL AF_UNIX
 #endif
 
+int
 main()
 {
   int passive, gaierr, inet4 = 0, inet6 = 0;
Index: configure.in
===================================================================
--- configure.in	(revision 18458)
+++ configure.in	(revision 18459)
@@ -1379,11 +1379,12 @@
 changequote(<<, >>)dnl
 <<
 #include <stdio.h>
-main ()
+int
+main()
 {
    char buf[256];
-   sprintf (buf, "%g", 1e+300);
-   exit (strcmp (buf, "1e+300") ? 0 : 1);
+   sprintf(buf, "%g", 1e+300);
+   return (strcmp (buf, "1e+300") ? 0 : 1);
 }
 >>,
 changequote([, ])dnl
@@ -1398,11 +1399,12 @@
 <<
 #include <stdio.h>
 #include <math.h>
-main ()
+int
+main()
 {
   char buf[256];
-  sprintf (buf, "%f", log(exp(1.0)));
-  exit (strcmp (buf, "1.000000") ? 0 : 1);
+  sprintf(buf, "%f", log(exp(1.0)));
+  return (strcmp (buf, "1.000000") ? 0 : 1);
 }
 >>,
 changequote([, ])dnl
Index: ChangeLog
===================================================================
Index: wince/wincemain.c
===================================================================
--- wince/wincemain.c	(revision 18458)
+++ wince/wincemain.c	(revision 18459)
@@ -2,18 +2,17 @@
 #include <stdio.h>
 #include "wince.h"
 
-extern int main(int, char**, char**);
+extern int main(int, char**);
 
 
 int WINAPI
 WinMain(HINSTANCE current, HINSTANCE prev, LPWSTR wcmd, int showcmd)
 {
-	/* wchar_t -> char */
-	wce_SetCommandLine(wcmd);
+    /* wchar_t -> char */
+    wce_SetCommandLine(wcmd);
 
-	wce_SetCurrentDir();
+    wce_SetCurrentDir();
 
-	/* main. */
-    return main(0, NULL, NULL);
+    /* main. */
+    return main(0, NULL);
 }
-
Index: win32/winmain.c
===================================================================
--- win32/winmain.c	(revision 18458)
+++ win32/winmain.c	(revision 18459)
@@ -1,10 +1,10 @@
 #include <windows.h>
 #include <stdio.h>
 
-extern int main(int, char**, char**);
+extern int main(int, char**);
 
 int WINAPI
 WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)
 {
-    return main(0, NULL, NULL);
+    return main(0, NULL);
 }
Index: main.c
===================================================================
--- main.c	(revision 18458)
+++ main.c	(revision 18459)
@@ -30,9 +30,9 @@
 #endif
 
 int
-main(argc, argv, envp)
+main(argc, argv)
     int argc;
-    char **argv, **envp;
+    char **argv;
 {
 #ifdef _WIN32
     NtInitialize(&argc, &argv);

Places

File ruby-18svn-r18459.patch of Package ruby

Places