summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2005-03-04 09:05:24 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2005-03-04 09:05:24 +0000
commit09027297a4c5320d36370e6c4d081a4f54d471ca (patch)
tree1e3871d0bea950654ee1d060c75b0cc8f60c20fb
parentdd02d86f2f77738cf3d011f76e35080f1fd0a1f7 (diff)
downloadlibapr-09027297a4c5320d36370e6c4d081a4f54d471ca.tar.gz
Merge r109326 from trunk:
* include/apr.h.in: Define __STDC_CONSTANT_MACROS for C++ so that stdint.h exposes the {,U}INT64_C macros. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@156146 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--include/apr.h.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/apr.h.in b/include/apr.h.in
index 3237d8ba0..929e19bce 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -116,6 +116,12 @@
#include <sys/socket.h>
#endif
+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
+/* C99 7.18.4 requires that stdint.h only exposes INT64_C
+ * and UINT64_C for C++ implementations if this is defined: */
+#define __STDC_CONSTANT_MACROS
+#endif
+
#if APR_HAVE_STDINT_H
#include <stdint.h>
#endif