aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisha Brukman <brukman+llvm@gmail.com>2004-09-03 19:46:43 +0000
committerMisha Brukman <brukman+llvm@gmail.com>2004-09-03 19:46:43 +0000
commit2d3dcb6a55c1c4a83b8e13e7cfd2e55f8cfe4740 (patch)
treefa7a0d7070f872e6b3175422952dde4765bb257b
parent18d55dd700ea9d60b8e22f67170787903bcbd26e (diff)
downloadexternal_llvm-2d3dcb6a55c1c4a83b8e13e7cfd2e55f8cfe4740.zip
external_llvm-2d3dcb6a55c1c4a83b8e13e7cfd2e55f8cfe4740.tar.gz
external_llvm-2d3dcb6a55c1c4a83b8e13e7cfd2e55f8cfe4740.tar.bz2
I was actually wrong in my "simplification".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16156 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Support/DataTypes.h.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in
index c218193..6b3aee8 100644
--- a/include/llvm/Support/DataTypes.h.in
+++ b/include/llvm/Support/DataTypes.h.in
@@ -36,12 +36,15 @@
@INCLUDE_INTTYPES_H@
@INCLUDE_SYS_TYPES_H@
@INCLUDE_STDINT_H@
-// Interix has u_int64_t, but not uint64_t
-#if !defined(HAVE_UINT64_T) && defined(HAVE_U_INT64_T)
+
+// Handle incorrect definition of uint64_t as u_int64_t
+#ifndef HAVE_UINT64_T
+#ifdef HAVE_U_INT64_T
typedef u_int64_t uint64_t;
#else
# error "Don't have a definition for uint64_t on this platform"
#endif
+#endif
#else
// Visual C++ doesn't provide standard integer headers, but it does provide