enhanced env not to crash if environ is pointing to null

2012-12-18 15:12:53 +00:00
parent 1595a9a4f3
commit 092a8106b2
5 changed files with 78 additions and 54 deletions
--- a/qse/include/qse/types.h
+++ b/qse/include/qse/types.h
@ -509,9 +509,11 @@ typedef int qse_mcint_t;
 * The qse_wcint_t type defines a type that can hold a qse_wchar_t value and 
 * #QSE_WCHAR_EOF.
 */
-#if defined(__cplusplus) && \
-    (!(defined(_MSC_VER) || defined(_SCO_DS)) || \
-     (defined(_MSC_VER) && defined(_NATIVE_WCHAR_T_DEFINED)))
+#if defined(__cplusplus) && !( \
+      (defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)) || \
+      (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) || \
+      defined(_SCO_DS) \
+    )
 	/* C++ */

 	typedef wchar_t qse_wchar_t;