merge error

c2f64850 · joreland@mysql.com · 44d76a49 · c2f64850
Commit c2f64850 authored Jan 03, 2005 by joreland@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

ndb/include/ndb_types.h ndb/include/ndb_types.h +0 -10

No files found.
--- a/ndb/include/ndb_types.h
+++ b/ndb/include/ndb_types.h
@@ -23,14 +23,4 @@

 #include "ndb_global.h"

-#ifdef __SIZE_TYPE__
-typedef __SIZE_TYPE__ UintPtr;
-#else
-#if SIZEOF_CHARP == 4
-typedef Uint32 UintPtr;
-#else
-typedef Uint64 UintPtr;
-#endif
-#endif
-
 #endif