aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-11-25 10:52:27 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-11-25 10:52:27 -0200
commit3a997eefb5b329fc7bc5de5a16f8d78cd6b6dcdc (patch)
treeb0558ce4b01283f440123ab440884ebc7b2c500b
parent5184ff209657cf76f3ef7e70a3db69b376b9ff17 (diff)
downloadlua-3a997eefb5b329fc7bc5de5a16f8d78cd6b6dcdc.tar.gz
lua-3a997eefb5b329fc7bc5de5a16f8d78cd6b6dcdc.tar.bz2
lua-3a997eefb5b329fc7bc5de5a16f8d78cd6b6dcdc.zip
MS_ASMTRICK is only valid on MS compilers (not any Windows compiler)
-rw-r--r--luaconf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/luaconf.h b/luaconf.h
index c881919b..b04a704d 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: luaconf.h,v 1.165 2011/11/05 15:29:05 roberto Exp roberto $ 2** $Id: luaconf.h,v 1.166 2011/11/09 14:47:14 roberto Exp roberto $
3** Configuration file for Lua 3** Configuration file for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -463,7 +463,7 @@
463 463
464/* On a Microsoft compiler on a Pentium, use assembler to avoid clashes 464/* On a Microsoft compiler on a Pentium, use assembler to avoid clashes
465 with a DirectX idiosyncrasy */ 465 with a DirectX idiosyncrasy */
466#if defined(LUA_WIN) && defined(_M_IX86) /* { */ 466#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86) /* { */
467 467
468#define MS_ASMTRICK 468#define MS_ASMTRICK
469 469