From 4211b129025d76ae9919bf755372c247a9f2590a Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 24 Jun 2004 17:04:58 +0000 Subject: * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when including version.h. [ruby-talk:104456] (backported from HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bcc32/setup.mak | 2 +- win32/setup.mak | 2 +- wince/setup.mak | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4784fe53f7..0be7b07ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 25 02:04:23 2004 NAKAMURA Usaku + + * {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 * io.c (rb_io_fread): return already read data when system call is diff --git a/bcc32/setup.mak b/bcc32/setup.mak index 04113dcaab..3b37b92fa8 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 5f243685ad..5aac81c603 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 ea997834fd..df2ed89a17 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 -- cgit v1.2.3