jscript: Don't redefine limits
André Hentschel
nerv at dawncrow.de
Sun Sep 22 14:35:29 CDT 2013
Android ndk r9 defines these already.
---
dlls/jscript/global.c | 2 --
dlls/jscript/jscript.h | 8 ++++++++
dlls/jscript/lex.c | 2 --
dlls/jscript/string.c | 2 --
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c
index 0c0aa29..6c91db3 100644
--- a/dlls/jscript/global.c
+++ b/dlls/jscript/global.c
@@ -29,8 +29,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
-
static const WCHAR NaNW[] = {'N','a','N',0};
static const WCHAR InfinityW[] = {'I','n','f','i','n','i','t','y',0};
static const WCHAR ArrayW[] = {'A','r','r','a','y',0};
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index aed2585..d40d441 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -468,6 +468,14 @@ static inline BOOL is_vclass(vdisp_t *vdisp, jsclass_t class)
#define INT32_MAX (2147483647)
#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX (0xffffffff)
+#endif
+
+#ifndef LONGLONG_MAX
+#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
+#endif
+
static inline BOOL is_int32(double d)
{
return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d;
diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index 54c8fcf..0660557 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -33,8 +33,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
-
static const WCHAR breakW[] = {'b','r','e','a','k',0};
static const WCHAR caseW[] = {'c','a','s','e',0};
static const WCHAR catchW[] = {'c','a','t','c','h',0};
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 8ef1656..98ee3a5 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -26,8 +26,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-#define UINT32_MAX 0xffffffff
-
typedef struct {
jsdisp_t dispex;
jsstr_t *str;
--
1.8.1.2
More information about the wine-patches
mailing list