[前][次][番号順一覧][スレッド一覧]

ruby-changes:16763

From: nobu <ko1@a...>
Date: Mon, 26 Jul 2010 18:18:43 +0900 (JST)
Subject: [ruby-changes:16763] Ruby:r28759 (ruby_1_8, trunk): * configure.in (config.h): add include guard.

nobu	2010-07-26 18:18:21 +0900 (Mon, 26 Jul 2010)

  New Revision: 28759

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28759

  Log:
    * configure.in (config.h): add include guard.
    
    * win32/Makefile.sub, bcc32/Makefile.sub (config.h): ditto.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/bcc32/Makefile.sub
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    branches/ruby_1_8/win32/Makefile.sub
    trunk/ChangeLog
    trunk/bcc32/Makefile.sub
    trunk/configure.in
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 28758)
+++ configure.in	(revision 28759)
@@ -2627,7 +2627,13 @@
 arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
 AS_MKDIR_P("${arch_hdrdir}")
 config_h="${arch_hdrdir}/config.h"
-tr -d '\015' < confdefs.h | grep -v "^#define PACKAGE_" |
+guard=INCLUDE_RUBY_CONFIG_H
+{
+  echo "#ifndef $guard"
+  echo "#define $guard 1"
+  grep -v "^#define PACKAGE_" confdefs.h
+  echo "#endif /* $guard */"
+} | tr -d '\015' |
 ${srcdir}/tool/ifchange "${config_h}" -
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28758)
+++ ChangeLog	(revision 28759)
@@ -1,3 +1,9 @@
+Mon Jul 26 18:18:09 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (config.h): add include guard.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub (config.h): ditto.
+
 Mon Jul 26 14:38:06 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (XCFLAGS): missing.h needs config.h.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 28758)
+++ win32/Makefile.sub	(revision 28759)
@@ -385,6 +385,8 @@
 !include config.h
 !endif
 
+guard = INCLUDE_RUBY_CONFIG_H
+
 $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 	@echo Creating config.h
 !if !exist("$(arch_hdrdir)")
@@ -394,6 +396,8 @@
 	@md $(arch_hdrdir:/=\)\ruby
 !endif
 	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) <<
+#ifndef $(guard)
+#define $(guard) 1
 #if _MSC_VER != $(MSC_VER)
 #error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected.
 #endif
@@ -601,6 +605,7 @@
 config.h: nul
 $(BANG)endif
 #endif
+#endif /* $(guard) */
 <<
 	@exit > $(@:/=\)
 
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 28758)
+++ bcc32/Makefile.sub	(revision 28759)
@@ -248,10 +248,14 @@
 
 config.status: $(CONFIG_H)
 
+guard = INCLUDE_RUBY_CONFIG_H
+
 $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 	@if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
 	@if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
 	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
+\#ifndef $(guard)
+\#define $(guard) 1
 \#define NO_BIG_INLINE 1
 \#define HAVE_SYS_TYPES_H 1
 \#define HAVE_SYS_STAT_H 1
@@ -364,6 +368,7 @@
 \#define DLEXT ".so"
 \#define RUBY_LIB_PREFIX "/lib/ruby"
 \#define RUBY_PLATFORM "$(ARCH)-$(OS)"
+\#endif /* $(guard) */
 |
 	@exit > $(@:/=\)
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 28758)
+++ ruby_1_8/configure.in	(revision 28759)
@@ -1983,11 +1983,19 @@
 fi
 AC_SUBST(MANTYPE)
 
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
+guard=INCLUDE_RUBY_CONFIG_H
+{
+  echo "#ifndef $guard"
+  echo "#define $guard 1"
+  cat confdefs.h
+  echo "#endif /* $guard */"
+} | tr -d '\015' > config.h.tmp
+if test -f config.h && cmp -s config.h config.h.tmp; then
   echo "config.h unchanged"
+  rm config.h.tmp
 else
   echo "creating config.h"
-  tr -d '\015' < confdefs.h > config.h
+  mv config.h.tmp config.h
 fi
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28758)
+++ ruby_1_8/ChangeLog	(revision 28759)
@@ -1,3 +1,9 @@
+Mon Jul 26 18:18:09 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (config.h): add include guard.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub (config.h): ditto.
+
 Sat Jul 24 15:44:29 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 28758)
+++ ruby_1_8/version.h	(revision 28759)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-07-24"
+#define RUBY_RELEASE_DATE "2010-07-26"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100724
+#define RUBY_RELEASE_CODE 20100726
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 26
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub	(revision 28758)
+++ ruby_1_8/bcc32/Makefile.sub	(revision 28759)
@@ -228,8 +228,12 @@
 
 config.status: $(CONFIG_H)
 
+guard = INCLUDE_RUBY_CONFIG_H
+
 $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 	@$(IFCHANGE) config.h &&|
+\#ifndef $(guard)
+\#define $(guard) 1
 \#define HAVE_SYS_TYPES_H 1
 \#define HAVE_SYS_STAT_H 1
 \#define HAVE_STDLIB_H 1
@@ -313,6 +317,7 @@
 \#define RUBY_ARCHLIB "/lib/ruby/$(ruby_version)/$(ARCH)-$(OS)"
 \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(ruby_version)/$(ARCH)-$(OS)"
 \#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(ruby_version)/$(ARCH)-$(OS)"
+\#endif /* $(guard) */
 |
 	@exit > $@
 
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 28758)
+++ ruby_1_8/win32/Makefile.sub	(revision 28759)
@@ -292,9 +292,13 @@
 !include config.h
 !endif
 
+guard = INCLUDE_RUBY_CONFIG_H
+
 $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 	@echo Creating config.h
 	@$(IFCHANGE) config.h <<
+#ifndef $(guard)
+#define $(guard) 1
 #if _MSC_VER != $(MSC_VER)
 #error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected.
 #endif
@@ -451,6 +455,7 @@
   #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 )
 #endif
 !endif
+#endif /* $(guard) */
 <<
 	@exit > $(@:/=\)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]