summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:34:31 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-09 15:34:31 +0000
commit125ca30ca270683ff029c27e6f5fcc4f26363841 (patch)
tree6f26d66583ff5afe5262a209e2f367f2654c172c
parent36ca3781bd1bed82aa898823cceb03ae99bf3d12 (diff)
* siphash.h: check configure macros before include newer headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--siphash.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57bd81aa4e..1a850f54a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-Sat Nov 10 00:19:09 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Nov 10 00:33:31 2012 NAKAMURA Usaku <usa@ruby-lang.org>
- * siphash.h: include inttypes.h only when HAVE_INTTYPES_H is defined.
+ * siphash.h: check configure macros before include newer headers.
Fri Nov 9 23:33:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/siphash.h b/siphash.h
index 8f56b99d55..3f3988408b 100644
--- a/siphash.h
+++ b/siphash.h
@@ -1,7 +1,9 @@
#ifndef SIPHASH_H
#define SIPHASH_H 1
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif