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/08/07 07:40:19 UTC
svn commit: r801888 - in
/commons/sandbox/runtime/trunk/src/main/native/include: acr.h
arch/windows/acr_arch_private.h
Author: mturk
Date: Fri Aug 7 05:40:19 2009
New Revision: 801888
URL: http://svn.apache.org/viewvc?rev=801888&view=rev
Log:
Use proper integer constant flags
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.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=801888&r1=801887&r2=801888&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr.h Fri Aug 7 05:40:19 2009
@@ -212,6 +212,8 @@
typedef PSID acr_uid_t;
typedef PSID acr_gid_t;
typedef HANDLE acr_osd_t;
+#define ACR_INT64_C(val) (val##I64)
+#define ACR_UINT64_C(val) (val##UI64)
#else /* !_MSC_VER */
typedef ssize_t acr_ssize_t;
#ifdef _LP64 /* 64-bit Solaris */
@@ -234,6 +236,13 @@
typedef uid_t acr_uid_t;
typedef gid_t acr_gid_t;
typedef int acr_osd_t;
+#if CC_SIZEOF_LONG == 8
+#define ACR_INT64_C(val) (val##L)
+#define ACR_UINT64_C(val) (val##UL)
+#else
+#define ACR_INT64_C(val) (val##LL)
+#define ACR_UINT64_C(val) (val##ULL)
+#endif
#endif /* _MSC_VER */
#if CC_SIZEOF_VOIDP == 8
@@ -245,12 +254,8 @@
#endif
#if CC_SIZEOF_LONG == 8
-#define ACR_INT64_C(val) (val##L)
-#define ACR_UINT64_C(val) (val##UL)
#define ACR_SL_ALIGN(T, X) T X
#else
-#define ACR_INT64_C(val) (val##LL)
-#define ACR_UINT64_C(val) (val##ULL)
#define ACR_SL_ALIGN(T, X) T X; long __align_##X
#endif
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=801888&r1=801887&r2=801888&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h Fri Aug 7 05:40:19 2009
@@ -68,7 +68,7 @@
/* Number of micro-seconds between the beginning of the Windows epoch
* (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970)
*/
-#define ACR_DELTA_EPOCH_IN_USEC 11644473600000000LL
+#define ACR_DELTA_EPOCH_IN_USEC 11644473600000000I64
/**