[llvm-commits] CVS: llvm/include/llvm/Support/DataTypes.h.in

[Misha Brukman]

Changes in directory llvm/include/llvm/Support:

DataTypes.h.in updated: 1.8 -> 1.9
---
Log message:

I was actually wrong in my "simplification".


---
Diffs of the changes:  (+5 -2)

Index: llvm/include/llvm/Support/DataTypes.h.in
diff -u llvm/include/llvm/Support/DataTypes.h.in:1.8 llvm/include/llvm/Support/DataTypes.h.in:1.9
--- llvm/include/llvm/Support/DataTypes.h.in:1.8	Fri Sep  3 14:44:28 2004
+++ llvm/include/llvm/Support/DataTypes.h.in	Fri Sep  3 14:46:43 2004
@@ -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