Imported Upstream version 1.5.7

1 files changed, 17 insertions, 5 deletions

diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp
index fa3f84f..06e0aeb 100644
--- a/utilities/step2vpl.cpp
+++ b/utilities/step2vpl.cpp
@@ -1,9 +1,14 @@
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <stdio.h>
 
 #include <fcntl.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 
 #include <lzsscomprs.h>
 
@@ -12,6 +17,9 @@
 #endif
 
 using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
 
 long SECTIONSLEVELSTART = 38;
 long SECTIONSLEVELSIZE = 29;
@@ -211,8 +219,9 @@ void readVersion(int fd, Version *versionRecord) {
 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
 
 	if (skip) {
-		char skipbuf[skip];
+		char *skipbuf = new char[skip];
 		read(fd, skipbuf, skip);
+		delete [] skipbuf;
 	}
 }
 
@@ -228,8 +237,9 @@ void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
 	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
 
 	if (skip) {
-		char skipbuf[skip];
+		char *skipbuf = new char[skip];
 		read(fd, skipbuf, skip);
+		delete [] skipbuf;
 	}
 }
 
@@ -247,8 +257,9 @@ void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
 
 	if (skip) {
-		char skipbuf[skip];
+		char *skipbuf = new char[skip];
 		read(fd, skipbuf, skip);
+		delete [] skipbuf;
 	}
 }
 
@@ -266,8 +277,9 @@ void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
 	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
 
 	if (skip) {
-		char skipbuf[skip];
+		char *skipbuf = new char[skip];
 		read(fd, skipbuf, skip);
+		delete [] skipbuf;
 	}
 }