Removed all PDOS related stuff

diff --git a/report.c b/report.c
index b30b515c4703e607e0182757afe9ccaf441c510e..7ac81783cdf746714d0733d3055ccd99f6ab09ba 100644 (file)
--- a/report.c
+++ b/report.c
@@ -9,19 +9,19 @@
 
 unsigned long errors = 0;
 
-#ifndef     __PDOS__
-#if     defined (_WIN32)
-# include   <windows.h>
-static int OriginalConsoleColor = -1;
-#endif
-
-static void reset_console_color (void) {
-
 #if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
-
+static void reset_console_color (void) {
     fprintf (stderr, "\033[0m");
+}
 
+static void set_console_color (int color) {
+    fprintf (stderr, "\033[%dm", color);
+}
 #elif   defined (_WIN32)
+# include   <windows.h>
+static int OriginalConsoleColor = -1;
+
+static void reset_console_color (void) {
 
     HANDLE hStdError = GetStdHandle (STD_ERROR_HANDLE);
     
@@ -30,18 +30,10 @@ static void reset_console_color (void) {
     SetConsoleTextAttribute (hStdError, OriginalConsoleColor);
     OriginalConsoleColor = -1;
 
-#endif
-
 }
 
 static void set_console_color (int color) {
 
-#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
-
-    fprintf (stderr, "\033[%dm", color);
-
-#elif   defined (_WIN32)
-
     HANDLE hStdError = GetStdHandle (STD_ERROR_HANDLE);
     WORD wColor;
     
@@ -60,8 +52,6 @@ static void set_console_color (int color) {
     wColor = (OriginalConsoleColor & 0xF0) + (color & 0xF);
     SetConsoleTextAttribute (hStdError, wColor);
 
-#endif
-
 }
 #endif
 
@@ -93,7 +83,7 @@ static void output_message (const char *filename, unsigned long lineno, unsigned
     
     if (type == REPORT_ERROR || type == REPORT_FATAL_ERROR) {
     
-#ifndef     __PDOS__
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) || defined (_WIN32)
         set_console_color (COLOR_ERROR);
 #endif
         
@@ -105,7 +95,7 @@ static void output_message (const char *filename, unsigned long lineno, unsigned
     
     } else if (type == REPORT_INTERNAL_ERROR) {
     
-#ifndef     __PDOS__
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) || defined (_WIN32)
         set_console_color (COLOR_INTERNAL_ERROR);
 #endif
         
@@ -113,7 +103,7 @@ static void output_message (const char *filename, unsigned long lineno, unsigned
     
     } else if (type == REPORT_WARNING) {
     
-#ifndef     __PDOS__
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) || defined (_WIN32)
         set_console_color (COLOR_WARNING);
 #endif
         
@@ -121,7 +111,7 @@ static void output_message (const char *filename, unsigned long lineno, unsigned
     
     }
     
-#ifndef     __PDOS__
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) || defined (_WIN32)
     reset_console_color ();
 #endif