* configure.in (config.h): add include guard.

* win32/Makefile.sub, bcc32/Makefile.sub (config.h): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 29 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 392e7f349c..b3d5586ea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 26 18:18:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index f31d6855c6..588d67d453 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -228,8 +228,12 @@ config: config.status
 
 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 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#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 > $@
 
diff --git a/configure.in b/configure.in
index 8c409a5bff..a564a6b116 100644
--- a/configure.in
+++ b/configure.in
@@ -1983,11 +1983,19 @@ if test -z "$MANTYPE"; then
 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
diff --git a/version.h b/version.h
index e920476c66..c94bf1b12b 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 7815895a81..1ca2762b14 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -292,9 +292,13 @@ BANG = !
 !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 @@ $(BANG)endif
   #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 )
 #endif
 !endif
+#endif /* $(guard) */
 <<
 	@exit > $(@:/=\)