Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-17 18:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build problems introduced by r18788

Browse source 
svn path=/trunk/; revision=18789
This commit is contained in:
Gé van Geldorp 2005-10-27 18:06:50 +00:00
parent d68c7aaf71
commit 20fa130a98
5 changed files with 518 additions and 518 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/tools/wpp/lex.yy.c
View file

@ -16877,7 +16877,7 @@ void pp_do_include(char *fname, int type)
/* Undo the effect of the quotation */
fname[n-1] = '\0';
if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL)
if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath, type)) == NULL)
pperror("Unable to open include file %s", fname+1);
fname[n-1] = *fname; /* Redo the quotes */

2
reactos/tools/wpp/ppl.l
View file

@ -1448,7 +1448,7 @@ void pp_do_include(char *fname, int type)
/* Undo the effect of the quotation */
fname[n-1] = '\0';
if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL)
if((ppin = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath, type)) == NULL)
pperror("Unable to open include file %s", fname+1);
fname[n-1] = *fname; /* Redo the quotes */

1028
reactos/tools/wrc/parser.tab.c
View file

File diff suppressed because it is too large Load diff

2
reactos/tools/wrc/parser.tab.h
View file

@ -202,7 +202,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 241 "./parser.y"
#line 241 "parser.y"
typedef union YYSTYPE {
string_t *str;
int num;

2
reactos/tools/wrc/parser.y
View file

@ -2320,7 +2320,7 @@ static raw_data_t *load_file(string_t *filename, language_t *lang)
if (codepage <= 0 && filename->type != str_char)
yyerror("Cannot convert filename to ASCII string");
name = convert_string( filename, str_char, codepage );
if (!(path = wpp_find_include(name->str.cstr, 1)))
if (!(path = wpp_find_include(name->str.cstr, input_name, 1)))
yyerror("Cannot open file %s", name->str.cstr);
if (!(fp = fopen( path, "rb" )))
yyerror("Cannot open file %s", name->str.cstr);