Commit 0bde2bbe authored by Alexandre Julliard's avatar Alexandre Julliard

Use <> format in generated #include statements.

Integer constants should be unsigned.
parent 7d43d7bb
...@@ -8522,7 +8522,7 @@ struct tagPROPVARIANT { ...@@ -8522,7 +8522,7 @@ struct tagPROPVARIANT {
typedef struct tagPROPVARIANT *LPPROPVARIANT; typedef struct tagPROPVARIANT *LPPROPVARIANT;
#define PRSPEC_INVALID (0x7fffffff) #define PRSPEC_INVALID (0xffffffff)
#define PRSPEC_LPWSTR (0) #define PRSPEC_LPWSTR (0)
......
...@@ -141,11 +141,11 @@ static UUID* parse_uuid(const char*u) ...@@ -141,11 +141,11 @@ static UUID* parse_uuid(const char*u)
return aUUID; return aUUID;
} }
{hex} { {hex} {
yylval.num = strtol(yytext, NULL, 0); yylval.num = strtoul(yytext, NULL, 0);
return aHEXNUM; return aHEXNUM;
} }
{int} { {int} {
yylval.num = strtol(yytext, NULL, 0); yylval.num = strtoul(yytext, NULL, 0);
return aNUM; return aNUM;
} }
{cident} return kw_token(yytext); {cident} return kw_token(yytext);
...@@ -360,7 +360,7 @@ int do_import(char *fname) ...@@ -360,7 +360,7 @@ int do_import(char *fname)
p = hname + strlen(hname) - 2; p = hname + strlen(hname) - 2;
if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h"); if (p <= hname || strcmp( p, ".h" )) strcat(hname, ".h");
fprintf(header, "#include \"%s\"\n", hname); fprintf(header, "#include <%s>\n", hname);
free(hname); free(hname);
} }
......
...@@ -107,7 +107,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; ...@@ -107,7 +107,7 @@ static type_t std_uhyper = { "MIDL_uhyper" };
func_t *func; func_t *func;
char *str; char *str;
UUID *uuid; UUID *uuid;
int num; unsigned int num;
} }
%token <str> aIDENTIFIER %token <str> aIDENTIFIER
......
...@@ -239,8 +239,8 @@ int main(int argc,char *argv[]) ...@@ -239,8 +239,8 @@ int main(int argc,char *argv[])
header = fopen(header_name, "w"); header = fopen(header_name, "w");
fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name); fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", WIDL_FULLVERSION, input_name);
fprintf(header, "#include \"rpc.h\"\n" ); fprintf(header, "#include <rpc.h>\n" );
fprintf(header, "#include \"rpcndr.h\"\n\n" ); fprintf(header, "#include <rpcndr.h>\n\n" );
fprintf(header, "#ifndef __WIDL_%s\n", header_token); fprintf(header, "#ifndef __WIDL_%s\n", header_token);
fprintf(header, "#define __WIDL_%s\n", header_token); fprintf(header, "#define __WIDL_%s\n", header_token);
fprintf(header, "#ifdef __cplusplus\n"); fprintf(header, "#ifdef __cplusplus\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment