Merge branch 'dev' of feistymeow.org:feisty_meow into dev

[feisty_meow.git] / nucleus / library / tests_basis / test_string.cpp

diff --git a/nucleus/library/tests_basis/test_string.cpp b/nucleus/library/tests_basis/test_string.cpp
index a4263ba4073efb712020d87d850fafa1053161e3..04c7f0d2defa55c52883c59919264418c86ddcb4 100644 (file)
--- a/nucleus/library/tests_basis/test_string.cpp
+++ b/nucleus/library/tests_basis/test_string.cpp
@@ -33,7 +33,7 @@
 #include <timely/time_stamp.h>
 #include <unit_test/unit_base.h>
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
   #include <comdef.h>
 #endif
 #include <stdio.h>
@@ -184,8 +184,8 @@ void test_string::run_test_02()
   *fred3 += *fred2;
 
   // testing adding a null to a string.
-  *fred2 += (char *)NIL;
-  *fred3 += (char *)NIL;
+  *fred2 += (char *)NULL_POINTER;
+  *fred3 += (char *)NULL_POINTER;
 
 #ifdef DEBUG_STRING_TEST
   LOG(astring("[ ") + *fred1 + " & " + *fred2 + "] -> " + *fred3);
@@ -775,6 +775,7 @@ void test_string::run_test_23()
 void test_string::run_test_24()
 {
   FUNCDEF("run_test_24");
+#ifndef __GNU_WINDOWS__
 #ifdef __WIN32__
   // 24th test group tests _bstr_t conversions.
   _bstr_t beast("abcdefgh");
@@ -793,6 +794,7 @@ void test_string::run_test_24()
   _bstr_t pork = string_convert::to_bstr_t(jethro);
   ASSERT_FALSE(strcmp(pork.operator char *(), jethro.s()), "second test failed comparison");
 #endif
+#endif
 }
 
 void test_string::run_test_25()