1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* common.mk: Borland MAKE doesn't look for file names which have paths

from VPATH.  fixed: [ruby-dev:26604]

* ruby.h (NORETURN, DEPRECATED): moved just after config.h.

* {win32,wince}/Makefile.sub: vsnprintf() is in missing now.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-07-25 12:29:37 +00:00
parent f65273b419
commit a6df88f00b
5 changed files with 17 additions and 11 deletions

View file

@ -1,3 +1,12 @@
Mon Jul 25 21:29:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk: Borland MAKE doesn't look for file names which have paths
from VPATH. fixed: [ruby-dev:26604]
* ruby.h (NORETURN, DEPRECATED): moved just after config.h.
* {win32,wince}/Makefile.sub: vsnprintf() is in missing now.
Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit. * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.

View file

@ -301,7 +301,7 @@ signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \ sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
{$(VPATH)}oniguruma.h config.h {$(VPATH)}oniguruma.h config.h
sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \ sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}missing/vsnprintf.c {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}vsnprintf.c
st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \ string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
{$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \ {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \

15
ruby.h
View file

@ -20,6 +20,13 @@ extern "C" {
#include "config.h" #include "config.h"
#define NORETURN_STYLE_NEW 1
#ifndef NORETURN
# define NORETURN(x) x
#endif
#ifndef DEPRECATED
# define DEPRECATED(x) x
#endif
#ifndef NOINLINE #ifndef NOINLINE
# define NOINLINE(x) x # define NOINLINE(x) x
#endif #endif
@ -57,14 +64,6 @@ extern "C" {
#define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c))) #define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c)))
#endif #endif
#define NORETURN_STYLE_NEW 1
#ifndef NORETURN
# define NORETURN(x) x
#endif
#ifndef DEPRECATED
# define DEPRECATED(x) x
#endif
#if defined(HAVE_ALLOCA_H) #if defined(HAVE_ALLOCA_H)
#include <alloca.h> #include <alloca.h>
#endif #endif

View file

@ -251,7 +251,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
#define HAVE_FLOCK 1 #define HAVE_FLOCK 1
#define HAVE_VSNPRINTF 1
#define HAVE_ISNAN 1 #define HAVE_ISNAN 1
#define HAVE_FINITE 1 #define HAVE_FINITE 1
#define HAVE_HYPOT 1 #define HAVE_HYPOT 1

View file

@ -251,7 +251,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
#define HAVE_STRTOL 1 #define HAVE_STRTOL 1
#define HAVE_STRTOUL 1 #define HAVE_STRTOUL 1
#define HAVE_FLOCK 1 #define HAVE_FLOCK 1
#define HAVE_VSNPRINTF 1
#define HAVE_FINITE 1 #define HAVE_FINITE 1
#define HAVE_HYPOT 1 #define HAVE_HYPOT 1
#define HAVE_FMOD 1 #define HAVE_FMOD 1