From 026671b3d5a7e1c581d8a250c5ecb97efd451b09 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 1 Mar 2016 03:18:29 +0100
Subject: [PATCH] Silence some pedantic compilation warnings.

---
 include/sqconfig.h       | 4 ++--
 sq/sq.c                  | 5 ++---
 sqstdlib/sqstdrex.cpp    | 2 +-
 sqstdlib/sqstdstring.cpp | 6 +++---
 squirrel/sqcompiler.cpp  | 1 +
 squirrel/sqopcodes.h     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/sqconfig.h b/include/sqconfig.h
index f8360f9..58bc979 100644
--- a/include/sqconfig.h
+++ b/include/sqconfig.h
@@ -60,10 +60,10 @@ typedef wchar_t SQChar;
 
 
 #define scstrcmp    wcscmp
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define scsprintf   _snwprintf
 #else
-#define scsprintf   snwprintf
+#define scsprintf   swprintf
 #endif
 #define scstrlen    wcslen
 #define scstrtod    wcstod
diff --git a/sq/sq.c b/sq/sq.c
index 0a96771..2a618c5 100644
--- a/sq/sq.c
+++ b/sq/sq.c
@@ -87,10 +87,10 @@ int getargs(HSQUIRRELVM v,int argc, char* argv[],SQInteger *retval)
 {
     int i;
     int compiles_only = 0;
+#ifdef SQUNICODE
     static SQChar temp[500];
-    const SQChar *ret=NULL;
+#endif
     char * output = NULL;
-    int lineinfo=0;
     *retval = 0;
     if(argc>1)
     {
@@ -307,7 +307,6 @@ int main(int argc, char* argv[])
 {
     HSQUIRRELVM v;
     SQInteger retval = 0;
-    const SQChar *filename=NULL;
 #if defined(_MSC_VER) && defined(_DEBUG)
     _CrtSetAllocHook(MemAllocHook);
 #endif
diff --git a/sqstdlib/sqstdrex.cpp b/sqstdlib/sqstdrex.cpp
index 22c1317..3ead1db 100644
--- a/sqstdlib/sqstdrex.cpp
+++ b/sqstdlib/sqstdrex.cpp
@@ -550,7 +550,7 @@ static const SQChar *sqstd_rex_matchnode(SQRex* exp,SQRexNode *node,const SQChar
 /* public api */
 SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error)
 {
-    SQRex *exp = (SQRex *)sq_malloc(sizeof(SQRex));
+    SQRex * volatile exp = (SQRex *)sq_malloc(sizeof(SQRex)); // "volatile" is needed for setjmp()
     exp->_eol = exp->_bol = NULL;
     exp->_p = pattern;
     exp->_nallocated = (SQInteger)scstrlen(pattern) * sizeof(SQChar);
diff --git a/sqstdlib/sqstdstring.cpp b/sqstdlib/sqstdstring.cpp
index 1ce1149..eadafe9 100644
--- a/sqstdlib/sqstdstring.cpp
+++ b/sqstdlib/sqstdstring.cpp
@@ -94,9 +94,9 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
             if(n < 0) return -1;
             SQInteger addlen = 0;
             SQInteger valtype = 0;
-            const SQChar *ts;
-            SQInteger ti;
-            SQFloat tf;
+            const SQChar *ts = NULL;
+            SQInteger ti = 0;
+            SQFloat tf = 0;
             switch(format[n]) {
             case 's':
                 if(SQ_FAILED(sq_getstring(v,nparam,&ts)))
diff --git a/squirrel/sqcompiler.cpp b/squirrel/sqcompiler.cpp
index 68b99ae..d36662b 100644
--- a/squirrel/sqcompiler.cpp
+++ b/squirrel/sqcompiler.cpp
@@ -983,6 +983,7 @@ public:
             SQInteger key = _fs->PopTarget();
             SQInteger attrs = hasattrs ? _fs->PopTarget():-1;
             assert((hasattrs && (attrs == key-1)) || !hasattrs);
+            (void)attrs; // UNUSED
             unsigned char flags = (hasattrs?NEW_SLOT_ATTRIBUTES_FLAG:0)|(isstatic?NEW_SLOT_STATIC_FLAG:0);
             SQInteger table = _fs->TopTarget(); //<<BECAUSE OF THIS NO COMMON EMIT FUNC IS POSSIBLE
             if(separator == _SC(',')) { //hack recognizes a table from the separator
diff --git a/squirrel/sqopcodes.h b/squirrel/sqopcodes.h
index ec4a56a..15d80e4 100644
--- a/squirrel/sqopcodes.h
+++ b/squirrel/sqopcodes.h
@@ -110,7 +110,7 @@ struct SQInstruction
 {
     SQInstruction(){};
     SQInstruction(SQOpcode _op,SQInteger a0=0,SQInteger a1=0,SQInteger a2=0,SQInteger a3=0)
-    {   op = _op;
+    {   op = (unsigned char)_op;
         _arg0 = (unsigned char)a0;_arg1 = (SQInt32)a1;
         _arg2 = (unsigned char)a2;_arg3 = (unsigned char)a3;
     }