Author: matz
Date: 2006-05-17 18:11:55 +0900 (Wed, 17 May 2006)
New Revision: 499

Removed:
   trunk/ext/racc/cparse/Makefile
Modified:
   trunk/ChangeLog
   trunk/dir.c
Log:
	* dir.c (sys_warning): should not call a vararg function
	  rb_sys_warning() indirectly.  [ruby-core:07886]


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-05-17 07:48:35 UTC (rev 498)
+++ trunk/ChangeLog	2006-05-17 09:11:55 UTC (rev 499)
@@ -4,6 +4,11 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2006-05-17(Wed) 18:09:20 +900  Yukihiro Matsumoto  <matz ruby-lang.org>
+
+	* dir.c (sys_warning): should not call a vararg function
+	  rb_sys_warning() indirectly.  [ruby-core:07886]
+
 2006-05-17(Wed) 16:41:41 +900  Yukihiro Matsumoto  <matz ruby-lang.org>
 
 	* re.c (rb_reg_initialize): should not allow modifying literal

Modified: trunk/dir.c
===================================================================
--- trunk/dir.c	2006-05-17 07:48:35 UTC (rev 498)
+++ trunk/dir.c	2006-05-17 09:11:55 UTC (rev 499)
@@ -915,9 +915,15 @@
     return INT2FIX(0);
 }
 
+static void
+sys_warning_1(const char* mesg)
+{
+    rb_sys_warning("%s", mesg);
+}
+
 #define GLOB_VERBOSE	(1 << (sizeof(int) * CHAR_BIT - 1))
 #define sys_warning(val) \
-    ((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)(VALUE))rb_sys_warning, (VALUE)(val), 0))
+    ((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
 
 /* System call with warning */
 static int

Deleted: trunk/ext/racc/cparse/Makefile
===================================================================
--- trunk/ext/racc/cparse/Makefile	2006-05-17 07:48:35 UTC (rev 498)
+++ trunk/ext/racc/cparse/Makefile	2006-05-17 09:11:55 UTC (rev 499)
@@ -1,143 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = $(hdrdir)/ext/racc/cparse
-topdir = ../../..
-hdrdir = $(topdir)/.
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr/local
-exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-datadir = $(prefix)/share
-includedir = $(prefix)/include
-infodir = $(prefix)/info
-sysconfdir = $(prefix)/etc
-mandir = $(prefix)/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -L. 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-CFLAGS   =  -fPIC -g -O2 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  
-CXXFLAGS = $(CFLAGS) -g -O2
-DLDFLAGS =   
-LDSHARED = $(CC) -shared
-LDSHAREDXX = $(CXX) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-linux
-sitearch = i686-linux
-ruby_version = 2.0
-ruby = $(topdir)/miniruby -I'$(topdir)' -I'$(hdrdir)/lib'
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = $(topdir)
-LIBPATH =  -L'$(topdir)'
-DEFFILE = 
-
-CLEANFILES = 
-DISTCLEANFILES = 
-
-extout = ./.ext
-extout_prefix = $(extout)$(target_prefix)/
-target_prefix = /racc
-LOCAL_LIBS = 
-LIBS =   -lpthread -ldl -lcrypt -lm   -lc
-SRCS = cparse.c
-OBJS = cparse.o
-TARGET = cparse
-DLLIB = $(TARGET).so
-STATIC_LIB = $(TARGET).a
-
-RUBYCOMMONDIR = $(extout)
-RUBYLIBDIR    = $(extout)$(target_prefix)
-RUBYARCHDIR   = $(extout)/$(arch)$(target_prefix)
-
-TARGET_SO     = $(RUBYARCHDIR)/$(DLLIB)
-CLEANLIBS     = $(RUBYARCHDIR)/$(TARGET).so $(RUBYARCHDIR)/$(TARGET).il? $(RUBYARCHDIR)/$(TARGET).tds $(RUBYARCHDIR)/$(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		install
-static:		$(STATIC_LIB) install-rb
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
-$(RUBYARCHDIR)/$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	@-$(MAKEDIRS) $(@D)
-	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
-
-$(STATIC_LIB): $(OBJS)
-	$(AR) cru $@ $(OBJS)
-	@-ranlib $(DLLIB) 2> /dev/null || true
-
-###
-cparse.o: cparse.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h


-- 
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml