Follow policy of not defining symbols from mpstd.h in the external interface, by removing the definition of mps_t_word from mps.h.

Copied from Perforce
 Change: 181096
 ServerID: perforce.ravenbrook.com

2 files changed, 3 insertions, 6 deletions

diff --git a/mps/code/mps.h b/mps/code/mps.h
index d4422c85f47..cc4397e7252 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -36,13 +36,11 @@
  * Then Microsoft made unsigned long shorter than a pointer on Win64.  Ugh.
  */
 
-#ifndef MPS_T_WORD
 #if defined(_MSC_VER) && defined(_WIN32) && defined(_WIN64) && defined(_M_X64)
-#define MPS_T_WORD      unsigned __int64
+typedef unsigned __int64 mps_word_t;
 #else
-#define MPS_T_WORD      unsigned long       /* won't be true on W3I6MV */
+typedef unsigned long mps_word_t;
 #endif
-#endif /* MPS_T_WORD */
 
 
 /* Abstract Types */
@@ -67,7 +65,6 @@ typedef struct mps_frame_s
 
 /* Concrete Types */
 
-typedef MPS_T_WORD mps_word_t;  /* pointer-sized word */
 typedef int mps_bool_t;         /* boolean (int) */
 typedef int mps_res_t;          /* result code (int) */
 typedef void *mps_addr_t;       /* managed address (void *) */
diff --git a/mps/code/mv2test.c b/mps/code/mv2test.c
index b2a466d529e..f4dacd295d2 100644
--- a/mps/code/mv2test.c
+++ b/mps/code/mv2test.c
@@ -13,7 +13,7 @@
 #include "mpscmvt.h"
 #include "mps.h"
 
-typedef MPS_T_WORD mps_count_t;  /* machine word (target dep.) */
+typedef mps_word_t mps_count_t;  /* machine word (target dep.) */
 
 #include "mpslib.h"
 #include "mpsavm.h"