ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Use BOOL instead of VARIANT_BOOL in lexer.

This commit is contained in:
Jacek Caban 2012-09-17 15:20:37 +02:00 committed by Alexandre Julliard
parent 6920b289b0
commit c5183bb505
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/jscript/engine.h
View File

@ -262,7 +262,7 @@ typedef struct {
union { union {
double dval; double dval;
const WCHAR *wstr; const WCHAR *wstr;
VARIANT_BOOL bval; BOOL bval;
struct { struct {
const WCHAR *str; const WCHAR *str;
DWORD str_len; DWORD str_len;
@ -272,7 +272,7 @@ typedef struct {
} literal_t; } literal_t;
literal_t *parse_regexp(parser_ctx_t*) DECLSPEC_HIDDEN; literal_t *parse_regexp(parser_ctx_t*) DECLSPEC_HIDDEN;
literal_t *new_boolean_literal(parser_ctx_t*,VARIANT_BOOL) DECLSPEC_HIDDEN; literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN;
typedef struct _variable_declaration_t { typedef struct _variable_declaration_t {
const WCHAR *identifier; const WCHAR *identifier;

6
dlls/jscript/lex.c
View File

@ -380,7 +380,7 @@ static literal_t *new_double_literal(parser_ctx_t *ctx, DOUBLE d)
return ret; return ret;
} }
literal_t *new_boolean_literal(parser_ctx_t *ctx, VARIANT_BOOL bval) literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval)
{ {
literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); literal_t *ret = parser_alloc(ctx, sizeof(literal_t));
@ -749,7 +749,7 @@ static int next_token(parser_ctx_t *ctx, void *lval)
struct _cc_var_t { struct _cc_var_t {
BOOL is_num; BOOL is_num;
union { union {
VARIANT_BOOL b; BOOL b;
DOUBLE n; DOUBLE n;
} u; } u;
struct _cc_var_t *next; struct _cc_var_t *next;
@ -822,7 +822,7 @@ static int init_cc(parser_ctx_t *ctx)
cc->vars = NULL; cc->vars = NULL;
v.is_num = FALSE; v.is_num = FALSE;
v.u.b = VARIANT_TRUE; v.u.b = TRUE;
if(!add_cc_var(cc, _jscriptW, &v) if(!add_cc_var(cc, _jscriptW, &v)
|| !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v) || !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v)
|| !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) { || !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) {