Author: jorton Date: Fri Mar 4 01:05:24 2005 New Revision: 156146 URL: http://svn.apache.org/viewcvs?view=rev&rev=156146 Log: Merge r109326 from trunk:
* include/apr.h.in: Define __STDC_CONSTANT_MACROS for C++ so that stdint.h exposes the {,U}INT64_C macros. Modified: apr/apr/branches/0.9.x/include/apr.h.in Modified: apr/apr/branches/0.9.x/include/apr.h.in URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/include/apr.h.in?view=diff&r1=156145&r2=156146 ============================================================================== --- apr/apr/branches/0.9.x/include/apr.h.in (original) +++ apr/apr/branches/0.9.x/include/apr.h.in Fri Mar 4 01:05:24 2005 @@ -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