From 1ee07e8b47dc97dd5d1c7c66fb85518af1f89cc4 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 23 Nov 2009 01:39:15 +0000 Subject: [PATCH] * dln.c (dln_find_1): not use prototype definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ dln.c | 12 ++++++++---- version.h | 6 +++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42a9980ab7..f40eb69f53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Nov 23 10:39:13 2009 Nobuyoshi Nakada + + * dln.c (dln_find_1): not use prototype definition. + Thu Nov 19 23:22:40 2009 Shugo Maeda * lib/net/ftp.rb (putbinaryfile): use APPE for resume. diff --git a/dln.c b/dln.c index e62870b265..36213ce173 100644 --- a/dln.c +++ b/dln.c @@ -1651,7 +1651,7 @@ dln_load(file) return 0; /* dummy return */ } -static char *dln_find_1(); +static char *dln_find_1 _((const char *fname, const char *path, char *buf, size_t size, int exe_flag)); static char fbuf[MAXPATHLEN]; @@ -1681,7 +1681,7 @@ dln_find_file(fname, path) { #ifndef __MACOS__ if (!path) path = "."; - return dln_find_1(fname, path, 0); + return dln_find_1(fname, path, fbuf, sizeof(fbuf), 0); #else if (!path) path = "."; return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, fbuf, sizeof(fbuf), 0)); @@ -1689,8 +1689,12 @@ dln_find_file(fname, path) } static char * -dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, - int exe_flag /* non 0 if looking for executable. */) +dln_find_1(fname, path, fbuf, size, exe_flag) + const char *fname; + const char *path; + char *fbuf; + size_t size; + int exe_flag; /* non 0 if looking for executable. */ { register const char *dp; register const char *ep; diff --git a/version.h b/version.h index 17bc1f544f..52776bc0a7 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-11-19" +#define RUBY_RELEASE_DATE "2009-11-23" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20091119 +#define RUBY_RELEASE_CODE 20091123 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 23 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];