diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | ext/digest/md5/md5.c | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl.c | 2 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | win32/winmain.c | 4 | ||||
| -rw-r--r-- | wince/wincemain.c | 13 |
8 files changed, 33 insertions, 18 deletions
@@ -1,3 +1,13 @@ +Sun Aug 10 08:15:05 2008 Nobuyoshi Nakada <[email protected]> + + * 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] + Sat Aug 9 21:10:51 2008 Nobuyoshi Nakada <[email protected]> * configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of diff --git a/configure.in b/configure.in index 87a53ecf25..8fecb4b401 100644 --- a/configure.in +++ b/configure.in @@ -1379,11 +1379,12 @@ case "$target_os" in 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 @@ changequote(<<, >>)dnl << #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 diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c index 993bc47a06..518f8239ed 100644 --- a/ext/digest/md5/md5.c +++ b/ext/digest/md5/md5.c @@ -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 @@ main() */ #ifdef COMPUTE_T_VALUES #include <math.h> +int main() { int i; diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index b7a5236267..9df7c59d2b 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -488,7 +488,7 @@ Init_openssl() * 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; } diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 8a13ddba73..9943466f0e 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -43,6 +43,7 @@ if enable_config("ipv6", default_ipv6) 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 @@ getaddr_info_ok = enable_config("wide-getaddrinfo") do #define AF_LOCAL AF_UNIX #endif +int main() { int passive, gaierr, inet4 = 0, inet6 = 0; @@ -30,9 +30,9 @@ static void objcdummyfunction( void ) { objc_msgSend(); } #endif int -main(argc, argv, envp) +main(argc, argv) int argc; - char **argv, **envp; + char **argv; { #ifdef _WIN32 NtInitialize(&argc, &argv); diff --git a/win32/winmain.c b/win32/winmain.c index 4902d1daaf..467a835d29 100644 --- a/win32/winmain.c +++ b/win32/winmain.c @@ -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); } diff --git a/wince/wincemain.c b/wince/wincemain.c index fb634a0eea..5122b57d02 100644 --- a/wince/wincemain.c +++ b/wince/wincemain.c @@ -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); } - |