diff options
author | Mike Pall <mike> | 2011-05-08 22:31:03 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2011-05-08 22:31:03 +0200 |
commit | 87553d9e77f440da012ed79eb373feaea8b03315 (patch) | |
tree | 0d84cd48f3bbc4098c6149aa23a9aea13a2d3fde | |
parent | 16369d5a64244a130688355fded6ccc65f47f093 (diff) | |
download | luajit-87553d9e77f440da012ed79eb373feaea8b03315.tar.gz luajit-87553d9e77f440da012ed79eb373feaea8b03315.tar.bz2 luajit-87553d9e77f440da012ed79eb373feaea8b03315.zip |
Avoid name clash with Windows MM_MAX define.
-rw-r--r-- | src/lj_err.c | 2 | ||||
-rw-r--r-- | src/lj_obj.h | 6 |
2 files changed, 4 insertions, 4 deletions
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) | |||
204 | BCReg slot = bc_a(*ip); | 204 | BCReg slot = bc_a(*ip); |
205 | if (bc_op(*ip) == BC_ITERC) slot -= 3; | 205 | if (bc_op(*ip) == BC_ITERC) slot -= 3; |
206 | return getobjname(funcproto(fn), ip, slot, name); | 206 | return getobjname(funcproto(fn), ip, slot, name); |
207 | } else if (mm != MM_MAX) { | 207 | } else if (mm != MM__MAX) { |
208 | *name = strdata(mmname_str(G(L), mm)); | 208 | *name = strdata(mmname_str(G(L), mm)); |
209 | return "metamethod"; | 209 | return "metamethod"; |
210 | } else { | 210 | } 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 { | |||
459 | #define MMENUM(name) MM_##name, | 459 | #define MMENUM(name) MM_##name, |
460 | MMDEF(MMENUM) | 460 | MMDEF(MMENUM) |
461 | #undef MMENUM | 461 | #undef MMENUM |
462 | MM_MAX, | 462 | MM__MAX, |
463 | MM____ = MM_MAX, | 463 | MM____ = MM__MAX, |
464 | MM_FAST = MM_eq | 464 | MM_FAST = MM_eq |
465 | } MMS; | 465 | } MMS; |
466 | 466 | ||
467 | /* GC root IDs. */ | 467 | /* GC root IDs. */ |
468 | typedef enum { | 468 | typedef enum { |
469 | GCROOT_MMNAME, /* Metamethod names. */ | 469 | GCROOT_MMNAME, /* Metamethod names. */ |
470 | GCROOT_MMNAME_LAST = GCROOT_MMNAME + MM_MAX-1, | 470 | GCROOT_MMNAME_LAST = GCROOT_MMNAME + MM__MAX-1, |
471 | GCROOT_BASEMT, /* Metatables for base types. */ | 471 | GCROOT_BASEMT, /* Metatables for base types. */ |
472 | GCROOT_BASEMT_NUM = GCROOT_BASEMT + ~LJ_TNUMX, | 472 | GCROOT_BASEMT_NUM = GCROOT_BASEMT + ~LJ_TNUMX, |
473 | GCROOT_IO_INPUT, /* Userdata for default I/O input file. */ | 473 | GCROOT_IO_INPUT, /* Userdata for default I/O input file. */ |