ソースを参照

Fixes to compile for windows

mingodad 9 年 前
コミット
0d9082fe38

+ 4 - 4
SquiLu-ext/sq_fs.cpp

@@ -307,10 +307,10 @@ static int _file_lock (HSQUIRRELVM v, FILE *fp, const char *mode, const long sta
 		default : return sq_throwerror (v, "%s: invalid mode", funcname);
 	}
 	if (!len) {
-		fseek (fh, 0L, SEEK_END);
-		len = ftell (fh);
+		fseek (fp, 0L, SEEK_END);
+		len = ftell (fp);
 	}
-	fseek (fh, start, SEEK_SET);
+	fseek (fp, start, SEEK_SET);
     int fd = fileno(fp);
 	code = _locking (fd, lkmode, len);
 #else
@@ -481,7 +481,7 @@ static SQRESULT _dir_constructor(HSQUIRRELVM v)
     if (strlen(path) > MAX_PATH-2)
       return sq_throwerror(v, "path too long: %s", path);
     else
-      scsnprintf (dir->pattern, sizeof(dir->pattern), "%s/*", path);
+      scsprintf (dir->pattern, sizeof(dir->pattern), "%s/*", path);
 #else
     dir->dir = opendir (path);
     if (dir->dir == NULL)

+ 1 - 1
SquiLu-ext/sq_slave_vm.cpp

@@ -563,7 +563,7 @@ static void *slaveThreadTask(void *p)
     return NULL;
 }
 
-extern int sq_system_sleep(int n);
+extern void sq_system_sleep(int n);
 
 static SQRESULT sq_slave_vm_thread_run(HSQUIRRELVM v)
 {

+ 1 - 1
SquiLu-ext/sqratimport.cpp

@@ -88,7 +88,7 @@ static SQRESULT sqrat_importbin(HSQUIRRELVM v, const SQChar* moduleName) {
         }
     }
 
-    modLoad = (SQMODULELOAD)GetProcAddressA(mod, "sqmodule_load");
+    modLoad = (SQMODULELOAD)GetProcAddress(mod, "sqmodule_load");
     if(modLoad == NULL) {
         FreeLibrary(mod);
         return SQ_ERROR;

+ 3 - 3
SquiLu/sqstdlib/sqstdsystem.cpp

@@ -352,12 +352,12 @@ static SQRESULT _system_setlocale (HSQUIRRELVM v) {
 /*-------------------------------------------------------------------------*\
 * Sleep for n miliseconds.
 \*-------------------------------------------------------------------------*/
-int sq_system_sleep(int n)
+void sq_system_sleep(int n)
 {
 #ifdef _WIN32
-    return Sleep(n);
+    Sleep(n);
 #else
-    return usleep((n)*1000);
+    usleep((n)*1000);
 #endif
 }
 static SQRESULT  _system_sleep(HSQUIRRELVM v)