summaryrefslogtreecommitdiff
path: root/src/luaconf.h
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2011-11-25 12:00:00 +0000
committerrepogen <>2011-11-25 12:00:00 +0000
commitdfa489618335f21b74e1b2040a64b28dcbe048a6 (patch)
tree0773b8d0b6f56011b3a63349e701e077b2d2181c /src/luaconf.h
parent2e5ae8240bb2daf5d66d69e199de10dde62f5d13 (diff)
downloadlua-github-dfa489618335f21b74e1b2040a64b28dcbe048a6.tar.gz
Lua 5.2.0-rc25.2.0-rc2
Diffstat (limited to 'src/luaconf.h')
-rw-r--r--src/luaconf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luaconf.h b/src/luaconf.h
index a5d62470..5cdb7b7b 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -1,5 +1,5 @@
/*
-** $Id: luaconf.h,v 1.166 2011/11/09 14:47:14 roberto Exp $
+** $Id: luaconf.h,v 1.167 2011/11/25 12:52:27 roberto Exp $
** Configuration file for Lua
** See Copyright Notice in lua.h
*/
@@ -463,7 +463,7 @@
/* On a Microsoft compiler on a Pentium, use assembler to avoid clashes
with a DirectX idiosyncrasy */
-#if defined(LUA_WIN) && defined(_M_IX86) /* { */
+#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */
#define MS_ASMTRICK