aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-01-04 10:46:04 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-01-04 10:46:04 -0200
commit9fe2d0266ac3ba30d432ca8edf6116beb94fe2af (patch)
treed96b895b338ce442d45fa870bad3c6098c6c9e29
parente22cdf7752bc4d19cc9dbfad8148e9ee90ee3524 (diff)
downloadlua-9fe2d0266ac3ba30d432ca8edf6116beb94fe2af.tar.gz
lua-9fe2d0266ac3ba30d432ca8edf6116beb94fe2af.tar.bz2
lua-9fe2d0266ac3ba30d432ca8edf6116beb94fe2af.zip
better configuration for Windows
-rw-r--r--luaconf.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/luaconf.h b/luaconf.h
index 7ec89f85..905a00ca 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: luaconf.h,v 1.21 2004/12/22 17:43:27 roberto Exp roberto $ 2** $Id: luaconf.h,v 1.22 2004/12/27 15:58:15 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*/
@@ -96,7 +96,7 @@
96#define stdin_is_tty() isatty(0) 96#define stdin_is_tty() isatty(0)
97#elif defined(_WIN32) 97#elif defined(_WIN32)
98#include <io.h> 98#include <io.h>
99#include <fcntl.h> 99#include <stdio.h>
100#define stdin_is_tty() _isatty(_fileno(stdin)) 100#define stdin_is_tty() _isatty(_fileno(stdin))
101#else 101#else
102#define stdin_is_tty() 1 /* assume stdin is a tty */ 102#define stdin_is_tty() 1 /* assume stdin is a tty */
@@ -217,8 +217,7 @@
217#if defined(__GNUC__) && defined(__i386) 217#if defined(__GNUC__) && defined(__i386)
218#define lua_number2int(i,d) __asm__ ("fistpl %0":"=m"(i):"t"(d):"st") 218#define lua_number2int(i,d) __asm__ ("fistpl %0":"=m"(i):"t"(d):"st")
219 219
220#elif defined(_WIN32) && defined(_M_IX86) 220#elif defined(_MSC_VER) && defined(_M_IX86)
221#include <math.h>
222#pragma warning(disable: 4514) 221#pragma warning(disable: 4514)
223__inline int l_lrint (double flt) 222__inline int l_lrint (double flt)
224{ int i; 223{ int i;