From 81a183ad850b87938f40a9c73cbca47abdd08b37 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 15 Aug 2007 22:30:33 +0000 Subject: * {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bcc32/setup.mak | 2 +- version.h | 2 +- win32/setup.mak | 2 +- wince/setup.mak | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dde0c2fae..210eded923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Aug 16 07:29:33 2007 Nobuyoshi Nakada + + * {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic. + Thu Aug 16 06:43:03 2007 Nobuyoshi Nakada * lib/mkmf.rb (init_mkmf): should remove mkmf.log too. diff --git a/bcc32/setup.mak b/bcc32/setup.mak index efc15c3ea7..b7a2539d0a 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -62,7 +62,7 @@ if exist usebormm.tds echo MEMLIB = usebormm.lib @usebormm.bat >> $(MAKEFILE) @del usebormm.* - @cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&| + @cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&| \#include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR diff --git a/version.h b/version.h index 999a50b96a..1e86d67a58 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 83 +#define RUBY_PATCHLEVEL 84 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/setup.mak b/win32/setup.mak index da7853bb20..d0e22b460e 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -115,7 +115,7 @@ int main(int argc, char **argv) @del rtname.* -version-: nul - @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >>$(MAKEFILE) + @$(CPP) -I$(srcdir) <<"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 d2dbad2317..7b729bf958 100644 --- a/wince/setup.mak +++ b/wince/setup.mak @@ -59,7 +59,7 @@ RDOCTARGET = $(RDOCTARGET) EXTOUT = $(EXTOUT) !endif << - @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE) + @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE) #include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR -- cgit v1.2.1