diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | main.c | 3 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Mon Dec 19 23:30:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub. + + * main.c (always_gc): dllimport is required for VC to import a DLL + symbol. fixed: [ruby-dev:28051] + Mon Dec 19 23:09:24 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert diff --git a/Makefile.in b/Makefile.in index 6dfeb1c38d..e4ece254fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,7 +33,8 @@ RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system empty = OUTFLAG = @OUTFLAG@$(empty) CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@ -CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ +XCFLAGS = -I. -I$(srcdir) +CPPFLAGS = @CPPFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) @@ -157,7 +158,7 @@ lex.c: keywords $(YACC) $(YFLAGS) -o $@ $< .c.@OBJEXT@: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c $< clean-local:: @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) @@ -10,6 +10,7 @@ **********************************************************************/ +#undef RUBY_EXPORT #include "ruby.h" #if defined(__MACOS__) && defined(__MWERKS__) @@ -25,7 +26,7 @@ int main(int argc, char **argv, char **envp) { #ifdef RUBY_GC_DEBUG - extern int always_gc; + RUBY_EXTERN int always_gc; always_gc = getenv("RUBY_ALWAYS_GC") != NULL; #endif #ifdef _WIN32 |