summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 08:04:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 08:04:45 +0000
commit9d215b7b97e2dde26fbb45525d210dc80feba738 (patch)
tree5a7caaa167cce7831d07459822c3bc92ee1d45c8
parent397fc9f1cb70cabaa2d099d49f5a369e5351850e (diff)
downloadruby-9d215b7b97e2dde26fbb45525d210dc80feba738.tar.gz
ruby-9d215b7b97e2dde26fbb45525d210dc80feba738.tar.xz
ruby-9d215b7b97e2dde26fbb45525d210dc80feba738.zip
* include/ruby/ruby.h (inttypes.h): includes always if available.
* string.c, ext/digest/defs.h: moved inttypes.h to ruby.h. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/digest/defs.h4
-rw-r--r--include/ruby/ruby.h4
-rw-r--r--string.c4
4 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 03f282b27..dc916c1a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 14 17:04:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (inttypes.h): includes always if available.
+
+ * string.c, ext/digest/defs.h: moved inttypes.h to ruby.h.
+
Fri Mar 14 16:59:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_LIB_PREFIX): fix for prefix.
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index bdffa2655..77a134f36 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,8 +16,4 @@
# define __END_DECLS
#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#endif
-
#endif /* DEFS_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index b8a7bba8c..1876ea4d7 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -58,6 +58,10 @@ extern "C" {
# include <intrinsics.h>
#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
#include <stddef.h>
#include <stdio.h>
diff --git a/string.c b/string.c
index fc7ed7c64..f88e6ba28 100644
--- a/string.c
+++ b/string.c
@@ -25,10 +25,6 @@
#include <unistd.h>
#endif
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
VALUE rb_cString;
VALUE rb_cSymbol;