You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/11/11 18:57:37 UTC
svn commit: r834986 -
/commons/sandbox/runtime/trunk/src/main/native/include/acr.h
Author: mturk
Date: Wed Nov 11 17:57:37 2009
New Revision: 834986
URL: http://svn.apache.org/viewvc?rev=834986&view=rev
Log:
Use inttypes for acr inttypes if defined
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr.h
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr.h?rev=834986&r1=834985&r2=834986&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr.h Wed Nov 11 17:57:37 2009
@@ -222,10 +222,26 @@
/* Typedefs that ACR needs. */
typedef unsigned char acr_byte_t;
+#if HAVE_INT16_T
+typedef int16_t acr_int16_t;
+#else
typedef short acr_int16_t;
+#endif
+#if HAVE_UINT16_T
+typedef uint16_t acr_uint16_t;
+#else
typedef unsigned short acr_uint16_t;
+#endif
+#if HAVE_INT32_T
+typedef int32_t acr_int32_t;
+#else
typedef int acr_int32_t;
+#endif
+#if HAVE_UINT32_T
+typedef uint32_t acr_uint32_t;
+#else
typedef unsigned int acr_uint32_t;
+#endif
typedef unsigned long apr_ino_t;
typedef size_t acr_size_t;
typedef jchar acr_wchar_t;
@@ -256,19 +272,31 @@
#define ACR_PPATH_MAX 8192
#else /* !_MSC_VER */
typedef ssize_t acr_ssize_t;
+#if HAVE_INT64_T
+typedef int64_t acr_int64_t;
+#else
#ifdef _LP64 /* 64-bit Solaris */
typedef long acr_int64_t;
-typedef long acr_time_t;
-typedef unsigned long acr_uint64_t;
#else
typedef long long acr_int64_t;
-typedef long long acr_time_t;
+#endif
+#endif
+
+#if HAVE_UINT64_T
+typedef uint64_t acr_uint64_t;
+#else
+#ifdef _LP64 /* 64-bit Solaris */
+typedef unsigned long acr_uint64_t;
+#else
typedef unsigned long long acr_uint64_t;
#endif
+#endif
+
+typedef acr_int64_t acr_time_t;
#if HAVE_OFF64_T
typedef off64_t acr_off_t;
#else
-typedef int64_t acr_off_t;
+typedef acr_int64_t acr_off_t;
#endif
typedef socklen_t acr_socklen_t;
/* API char type on POSIX is always char (UTF-8) */