Sync to Wine-20050310:

Merge back WineHQ commits

svn path=/trunk/; revision=14055
This commit is contained in:
Gé van Geldorp 2005-03-14 10:44:46 +00:00
parent e51a2aab8f
commit 61dcda8178
2 changed files with 158 additions and 160 deletions

File diff suppressed because it is too large Load diff

View file

@ -563,7 +563,6 @@ includelogicentry_t *pp_includelogiclist = NULL;
pplval.cptr = get_string();
if (is_c_h_include(pplval.cptr, 1)) pass_data=0;
else pass_data=1;
//fprintf(stderr, "%s pass_data %d\n", pplval.cptr, pass_data);
return tDQSTRING;
default:
put_string();
@ -1418,7 +1417,7 @@ static int is_c_h_include(char *fname, int quoted)
int sl=strlen(fname);
if (sl < 2 + 2 * quoted) return 0;
if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0;
if (fname[sl-2-quoted]!='.') return 0;
if (fname[sl-2-quoted]!='.') return 0;
return 1;
}