summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-27 06:05:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-27 06:05:04 +0000
commit51e6d9061dc8090bd1c9e3a1a8dadbbd9294a48d (patch)
tree034956384b778251a1dd4090d2f19a43a0d0025b /ext
parent8df4564367f895a5ba6f9186f7c90ebd07c874bb (diff)
* misc/ruby-mode.el: better support for general delimited
strings. [ruby-dev:22695] * lib/weakref.rb (WeakRef::initialize): set up @__id before calling "super". * lib/delegate.rb (Delegator::initialize): preserve singleton_method_added method [ruby-dev:22685] * lib/delegate.rb (Delegator::initialize): use Kernel::raise instead of mere raise. [ruby-dev:22681] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/curses/curses.c6
-rw-r--r--ext/iconv/extconf.rb2
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 106c43da4c..0408fbd6bc 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -21,7 +21,11 @@
#elif defined(HAVE_NCURSES_CURSES_H)
# include <ncurses/curses.h>
#elif defined(HAVE_CURSES_COLR_CURSES_H)
-# include <varargs.h>
+# ifdef HAVE_STDARG_PROTOTYPES
+# include <stdarg.h>
+# else
+# include <varargs.h>
+# endif
# include <curses_colr/curses.h>
#else
# include <curses.h>
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index 36cd60ed15..73174a17f2 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -20,7 +20,7 @@ test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
else
$defs.push('-DICONV_INPTR_CAST="(char **)"')
end
- have_library("iconv")
+ have_library("iconv", "iconv")
if conf
prefix = '$(srcdir)'
prefix = $nmake ? "{#{prefix}}" : "#{prefix}/"