summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2010-03-02 11:53:12 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2010-03-02 11:53:12 +0000
commit2d14f9f42b3f750d42e33297b49cd06b16de01a0 (patch)
treea5ed9d580d90108e523c9a8e0192d643462c897e
parentc7c859727fe2d0a4ca7138b84547ab6cba75369a (diff)
downloadpcre-2d14f9f42b3f750d42e33297b49cd06b16de01a0.tar.gz
If stdint.h is not available, include inttypes.h if available.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@494 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog3
-rw-r--r--pcre_internal.h7
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a029406..08e47b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ Version 8.02 01-Mar-2010
3. Updated the licensing terms in the pcregexp.pas file, as agreed with the
original author of that file, following a query about its status.
+
+4. On systems that do not have stdint.h (e.g. Solaris), check for and include
+ inttypes.h instead. This fixes a bug that was introduced by change 8.01/8.
Version 8.01 19-Jan-2010
diff --git a/pcre_internal.h b/pcre_internal.h
index aa1983e..363644c 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -188,11 +188,14 @@ preprocessor time in standard C environments. */
large integers. If a 64-bit integer type is available, we can use that.
Otherwise we have to cast to double, which of course requires floating point
arithmetic. Handle this by defining a macro for the appropriate type. If
-stdint.h is available, include it; it may define INT64_MAX. The macro int64_t
-may be set by "configure". */
+stdint.h is available, include it; it may define INT64_MAX. Systems that do not
+have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set
+by "configure". */
#if HAVE_STDINT_H
#include <stdint.h>
+#elif HAVE_INTTYPES_H
+#include <inttypes.h>
#endif
#if defined INT64_MAX || defined int64_t