Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix end of stream exception when generating makefile
This commit is contained in:
Anatol Belski 2014-07-10 22:34:55 +02:00
commit efcc789ef8

View File

@ -1821,7 +1821,9 @@ function generate_makefile()
MFO.Close();
TF = FSO.OpenTextFile("Makefile.objects", 1);
MF.Write(TF.ReadAll());
if (!TF.AtEndOfStream) {
MF.Write(TF.ReadAll());
}
TF.Close();
MF.Close();