From a6df88f00b8eac543a29c6c8376f3300d3a310bb Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 25 Jul 2005 12:29:37 +0000
Subject: * 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
---
 ChangeLog          |  9 +++++++++
 common.mk          |  2 +-
 ruby.h             | 15 +++++++--------
 win32/Makefile.sub |  1 -
 wince/Makefile.sub |  1 -
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b42230006..a7b8d480ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
diff --git a/common.mk b/common.mk
index e53aaf89dd..c03e19c57a 100644
--- a/common.mk
+++ b/common.mk
@@ -301,7 +301,7 @@ signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
 sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
   {$(VPATH)}oniguruma.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
 string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
diff --git a/ruby.h b/ruby.h
index 71f769eb1b..ddda5c396b 100644
--- a/ruby.h
+++ b/ruby.h
@@ -20,6 +20,13 @@ extern "C" {
 
 #include "config.h"
 
+#define NORETURN_STYLE_NEW 1
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+#ifndef DEPRECATED
+# define DEPRECATED(x) x
+#endif
 #ifndef NOINLINE
 # define NOINLINE(x) x
 #endif
@@ -57,14 +64,6 @@ extern "C" {
 #define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c)))
 #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)
 #include <alloca.h>
 #endif
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 852c7f2f84..3cef63ee66 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -251,7 +251,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
 #define HAVE_FLOCK 1
-#define HAVE_VSNPRINTF 1
 #define HAVE_ISNAN 1
 #define HAVE_FINITE 1
 #define HAVE_HYPOT 1
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 3be25abc6a..dc5ec293ba 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -251,7 +251,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
 #define HAVE_STRTOL 1
 #define HAVE_STRTOUL 1
 #define HAVE_FLOCK 1
-#define HAVE_VSNPRINTF 1
 #define HAVE_FINITE 1
 #define HAVE_HYPOT 1
 #define HAVE_FMOD 1
-- 
cgit v1.2.3