summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:19:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:19:56 +0000
commitf20ea787a5974ad87888024be8f589456708225d (patch)
tree6da452911d2aa934d251f25cf2443896c8943bb6
parente3adacf0cb4297a5a0c1ae1b0a872d18939f2d4a (diff)
* siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--siphash.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99fb678d33..57bd81aa4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 10 00:19:09 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined.
+
Fri Nov 9 23:33:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/erb.rb (ERB#run, ERB#result): eval under isolated bindings for
diff --git a/siphash.h b/siphash.h
index 2a06f32371..8f56b99d55 100644
--- a/siphash.h
+++ b/siphash.h
@@ -2,7 +2,9 @@
#define SIPHASH_H 1
#include <stdlib.h>
#include <stdint.h>
+#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
+#endif
#ifndef HAVE_UINT64_T
typedef struct {