Moved some defines used in sqstdstring.cpp to squirrel.h

include/squirrel.h

@@ -130,6 +130,8 @@ typedef wchar_t SQChar;
 typedef wchar_t USQChar;
 #define uchar(c)    ((unsigned short)(c))
 #define _SC(a) L##a
+#define scstrchr wcschr
+#define scsnprintf wsnprintf
 #define	scstrcmp	wcscmp
 #define scsprintf	swprintf
 #define scsnprintf	swnprintf
@@ -159,6 +161,8 @@ typedef char SQChar;
 typedef unsigned char USQChar;
 #define uchar(c)    ((unsigned char)(c))
 #define _SC(a) a
+#define scstrchr strchr
+#define scsnprintf snprintf
 #define	scstrcmp	strcmp
 #define scsprintf	sprintf
 #define scsnprintf	snprintf

sqstdlib/sqstdstring.cpp

@@ -7,17 +7,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#ifdef SQUNICODE
-#define scstrchr wcschr
-#define scsnprintf wsnprintf
-#define scatoi _wtoi
-#define scstrtok wcstok
-#else
-#define scstrchr strchr
-#define scsnprintf snprintf
-#define scatoi atoi
-#define scstrtok strtok
-#endif
 #define MAX_FORMAT_LEN	20
 #define MAX_WFORMAT_LEN	3
 #define ADDITIONAL_FORMAT_SPACE (100*sizeof(SQChar))