MSVC Fixes

lefticus · lefticus · commit b71f9db5c2e3 · 2015-03-13T22:27:51.000-06:00
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
@@ -150,8 +150,8 @@ namespace chaiscript
           return std::string(t_str.begin(), t_str.end());
         }
 
-#ifdef _UNICODE
-      template<typename T>
+#if defined(_UNICODE) || defined(UNICODE)
+        template<typename T>
         static std::wstring to_proper_string(const T &t_str)
         {
           return to_wstring(t_str);
@@ -166,7 +166,7 @@ namespace chaiscript
 
       static std::string get_error_message(DWORD t_err)
       {
-#ifdef _UNICODE
+#if defined(_UNICODE) || defined(UNICODE)
         typedef LPWSTR StringType;
         std::wstring retval = L"Unknown Error";
 #else
diff --git a/src/main.cpp b/src/main.cpp
@@ -24,7 +24,7 @@ char *mystrdup (const char *s) {
   char *d = static_cast<char*>(malloc (len+1));
   if (d == nullptr) return nullptr;          // No memory
 #ifdef CHAISCRIPT_MSVC
-  strcpy_s(d, len, s);                        // Copy the characters
+  strcpy_s(d, len+1, s);                        // Copy the characters
 #else
   strncpy(d,s,len);                        // Copy the characters
 #endif

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ namespace chaiscript`
`150`	`150`	`return std::string(t_str.begin(), t_str.end());`
`151`	`151`	`}`
`152`	`152`
`153`		`-#ifdef _UNICODE`
`154`		`- template<typename T>`
	`153`	`+#if defined(_UNICODE) \|\| defined(UNICODE)`
	`154`	`+ template<typename T>`
`155`	`155`	`static std::wstring to_proper_string(const T &t_str)`
`156`	`156`	`{`
`157`	`157`	`return to_wstring(t_str);`
`@@ -166,7 +166,7 @@ namespace chaiscript`
`166`	`166`
`167`	`167`	`static std::string get_error_message(DWORD t_err)`
`168`	`168`	`{`
`169`		`-#ifdef _UNICODE`
	`169`	`+#if defined(_UNICODE) \|\| defined(UNICODE)`
`170`	`170`	`typedef LPWSTR StringType;`
`171`	`171`	`std::wstring retval = L"Unknown Error";`
`172`	`172`	`#else`