From 28651fcd3db70dc779fd2d8d119229d3721de34b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Jan 2004 06:05:04 +0000
Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/curses/curses.c  | 6 +++++-
 ext/iconv/extconf.rb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 106c43da4..0408fbd6b 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 36cd60ed1..73174a17f 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}/"
-- 
cgit