new template for 3.5x3.5 sized cards

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

diff --git a/nucleus/library/tests_basis/test_system_preconditions.cpp b/nucleus/library/tests_basis/test_system_preconditions.cpp
index f18f17d6e106022b8bf62f3ff139a2243887e818..9f32d434a78724d7c5d47f68815ab4971aebca45 100644 (file)
--- a/nucleus/library/tests_basis/test_system_preconditions.cpp
+++ b/nucleus/library/tests_basis/test_system_preconditions.cpp
@@ -136,7 +136,7 @@ int test_system_preconditions::execute()
   ASSERT_FALSE(chunko, "chunko whack test should succeed");
   ASSERT_FALSE(alias, "aliased lorkas whack test should succeed");
   ASSERT_TRUE(lorkas, "original lorkas should not have been cleared");
-  lorkas = NIL;
+  lorkas = NULL_POINTER;
 
   ASSERT_EQUAL((int)sizeof(testing_file_struct), (int)sizeof(FILE),
       "struct size test, sizeof testing_file_struct and sizeof FILE should not differ");
@@ -147,16 +147,10 @@ int test_system_preconditions::execute()
 
 #ifdef __WIN32__
   known_operating_systems os = determine_OS();
-  if (os == WIN_95)
-    printf("This is windows 95.\n");
-  else if (os == WIN_NT)
-    printf("This is windows NT.\n");
-  else if (os == WIN_2K)
-    printf("This is windows 2000.\n");
-  else if (os == WIN_XP)
-    printf("This is windows XP.\n");
-  else 
-    printf("This OS is unknown.\n");
+  astring os_report = "This OS is: ";
+  os_report += opsystem_name(os);
+  os_report += "\n";
+  printf(os_report.s());
 #endif
 
   version os_ver = application_configuration::get_OS_version();