summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bcc32/setup.mak2
-rw-r--r--win32/setup.mak2
-rw-r--r--wince/setup.mak2
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4784fe5..0be7b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 25 02:04:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
+ including version.h. [ruby-talk:104456] (backported from HEAD)
+
Thu Jun 24 14:23:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_fread): return already read data when system call is
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 04113dc..3b37b92 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -34,7 +34,7 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
\#\#\# Makefile for ruby $(OS) \#\#\#
srcdir = $(srcdir:\=/)
|
- @cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
+ @cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
\#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
diff --git a/win32/setup.mak b/win32/setup.mak
index 5f24368..5aac81c 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -33,7 +33,7 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
### Makefile for ruby $(OS) ###
srcdir = $(srcdir:\=/)
<<
- @cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
+ @cl -nologo -EP -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
diff --git a/wince/setup.mak b/wince/setup.mak
index ea99783..df2ed89 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -48,7 +48,7 @@ armv4i-sig3-wince: -prologue- -armv4i- -sig3- -epilogue-
### Makefile for ruby $(OS) ###
srcdir = $(srcdir:\=/)
<<
- @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
+ @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR