From: Julian Seward <jseward@acm.org>
Date: Wed, 20 Oct 2004 18:33:03 +0000 (+0000)
Subject: Apparently editing tool.h directly was not a clever thing to do :-)
X-Git-Tag: svn/VALGRIND_3_0_1^2~947
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=100493f7e79edc7fc23e94501ec7cedf7d69bf15;p=thirdparty%2Fvalgrind.git

Apparently editing tool.h directly was not a clever thing to do :-)


git-svn-id: svn://svn.valgrind.org/vex/trunk@387
---

diff --git a/VEX/head20041019/include/tool.h.base b/VEX/head20041019/include/tool.h.base
index 4f9133100f..180cfd7659 100644
--- a/VEX/head20041019/include/tool.h.base
+++ b/VEX/head20041019/include/tool.h.base
@@ -36,32 +36,15 @@
 
 #include "tool_asm.h"           // asm stuff
 
+#include "../../../pub/libvex_basictypes.h"
+
 /*====================================================================*/
 /*=== Basic types                                                  ===*/
 /*====================================================================*/
 
-// By choosing the right types, we can get these right for 32-bit and 64-bit
-// platforms without having to do any conditional compilation or anything.
-//
-// Size in bits on:                          32-bit archs   64-bit archs
-//                                           ------------   ------------
-typedef unsigned char          UChar;     //  8              8
-typedef unsigned short         UShort;    // 16             16
-typedef unsigned int           UInt;      // 32             32
-typedef unsigned long          UWord;     // 32             64
-typedef unsigned long long     ULong;     // 64             64
-
-typedef signed char            Char;      //  8              8
-typedef signed short           Short;     // 16             16
-typedef signed int             Int;       // 32             32
-typedef signed long            Word;      // 32             64
-typedef signed long long       Long;      // 64             64
-
-typedef UWord                  Addr;      // 32             64
-
-typedef UChar                  Bool;      //  8              8
-#define False                  ((Bool)0)
-#define True                   ((Bool)1)
+typedef  HWord  UWord;
+typedef  HWord  Addr;
+
 
 /* ---------------------------------------------------------------------
    Now the basic types are set up, we can haul in the kernel-interface