diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 11:51:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 11:51:16 +0100 |
| commit | 96276c847a5c266f9f51f3ec4ece8fe3f1381c96 (patch) | |
| tree | cced2f3df95ab841e860e39413203c93aebb6c07 /tools/mhmake/src/mhmakefileparser.cpp | |
| parent | 2b6ab5ff6c32e8bda9f50e38d12367502d3dd32c (diff) | |
| download | vcxsrv-96276c847a5c266f9f51f3ec4ece8fe3f1381c96.tar.gz vcxsrv-96276c847a5c266f9f51f3ec4ece8fe3f1381c96.tar.bz2 vcxsrv-96276c847a5c266f9f51f3ec4ece8fe3f1381c96.zip | |
Made creation of temp files interprocess safe in windows
Fixes for 64-bit compilation
Implemented realpath function
Improved auodep scanning
Solved a problem in dependency scanning
Diffstat (limited to 'tools/mhmake/src/mhmakefileparser.cpp')
| -rw-r--r-- | tools/mhmake/src/mhmakefileparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mhmake/src/mhmakefileparser.cpp b/tools/mhmake/src/mhmakefileparser.cpp index a359de117..d1f41b07f 100644 --- a/tools/mhmake/src/mhmakefileparser.cpp +++ b/tools/mhmake/src/mhmakefileparser.cpp @@ -517,7 +517,7 @@ void mhmakefileparser::GetAutoDeps(const fileinfo *pFirstDep, deps_t &Autodeps) Type[0]='"';
if (Ret=='i')
{
- Ret=fscanf(pIn,"mport %254[^\"\n]",IncludeList);
+ Ret=fscanf(pIn,"mport%*[ \t]%254[^\"\n]",IncludeList);
if (Ret==1)
{
if (IncludeList[0]!='*')
@@ -552,10 +552,10 @@ void mhmakefileparser::GetAutoDeps(const fileinfo *pFirstDep, deps_t &Autodeps) if (Ret=='#')
{
Ret=fscanf(pIn,"%*[ \t]");
- Ret=fscanf(pIn,"include %1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);
+ Ret=fscanf(pIn,"include%*[ \t]%1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);
}
else
- Ret=fscanf(pIn,"import %1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);
+ Ret=fscanf(pIn,"import%*[ \t]%1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);
if (Ret==2)
{
bFound=true;
|