* marshal.c (w_symbol, w_object): get rid of warnings.

* re.c (rb_memsearch): ditto.

* time.c (time_dump): ditto.

* ext/extmk.rb (extmake): not continue making when extconf.rb
  failed.

* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.

* ext/openssl/ossl.h: remove version.h dependency.

* ext/openssl/ruby_missing.h: ditto.

* lib/mkmf.rb (pkg_config): use --libs output except with
  only-L for other options.  [ruby-list:38099]

* lib/mkmf.rb (create_makefile): separate rule for static
  library from shared object.

* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
  define exec_prefix and libdir.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 3 deletions

diff --git a/re.c b/re.c
index e81b093a3e..53c6832c2a 100644
--- a/re.c
+++ b/re.c
@@ -69,8 +69,6 @@ static const char casetable[] = {
 # error >>> "You lose. You will need a translation table for your character set." <<<
 #endif
 
-#define MIN(a,b) (((a)>(b))?(b):(a))
-
 int
 rb_memcicmp(p1, p2, len)
     char *p1, *p2;
@@ -101,7 +99,7 @@ rb_memsearch(x0, m, y0, n)
     char *x0, *y0;
     long m, n;
 {
-    unsigned char *x = x0, *y = y0;
+    unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
     unsigned char *s, *e;
     long i;
     int d;