From: Mike Pall <mike>
Date: Sun, 8 May 2011 20:31:03 +0000 (+0200)
Subject: Avoid name clash with Windows MM_MAX define.
X-Git-Tag: v2.0.0-beta8~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87553d9e77f440da012ed79eb373feaea8b03315;p=thirdparty%2FLuaJIT.git

Avoid name clash with Windows MM_MAX define.
---

diff --git a/src/lj_err.c b/src/lj_err.c
index 7eaffdb6..d1d326e9 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -204,7 +204,7 @@ static const char *getfuncname(lua_State *L, TValue *frame, const char **name)
     BCReg slot = bc_a(*ip);
     if (bc_op(*ip) == BC_ITERC) slot -= 3;
     return getobjname(funcproto(fn), ip, slot, name);
-  } else if (mm != MM_MAX) {
+  } else if (mm != MM__MAX) {
     *name = strdata(mmname_str(G(L), mm));
     return "metamethod";
   } else {
diff --git a/src/lj_obj.h b/src/lj_obj.h
index 43f3d6ad..c1bdb844 100644
--- a/src/lj_obj.h
+++ b/src/lj_obj.h
@@ -459,15 +459,15 @@ typedef enum {
 #define MMENUM(name)	MM_##name,
 MMDEF(MMENUM)
 #undef MMENUM
-  MM_MAX,
-  MM____ = MM_MAX,
+  MM__MAX,
+  MM____ = MM__MAX,
   MM_FAST = MM_eq
 } MMS;
 
 /* GC root IDs. */
 typedef enum {
   GCROOT_MMNAME,	/* Metamethod names. */
-  GCROOT_MMNAME_LAST = GCROOT_MMNAME + MM_MAX-1,
+  GCROOT_MMNAME_LAST = GCROOT_MMNAME + MM__MAX-1,
   GCROOT_BASEMT,	/* Metatables for base types. */
   GCROOT_BASEMT_NUM = GCROOT_BASEMT + ~LJ_TNUMX,
   GCROOT_IO_INPUT,	/* Userdata for default I/O input file. */