Fixed build related macro bug that assumed that StormPortLinux.cpp and StormPortMac.cpp would only ever be compiled on Windows or the target platform.

src/tools/stuffextract/StormLib/StormPortLinux.cpp

@@ -24,7 +24,7 @@
 *
 ********************************************************************/
 #include <string>
-#ifndef _WIN32
+#if defined(__linux) || defined(linux)
 #include "StormPort.h"
 
 int globalerr;
@@ -41,40 +41,33 @@ int GetLastError()
 
 const char *ErrString(int err)
 {
-    std::string strings[] =
+    switch (err)
-{
+    {
-"function not implemented",  "file not found", "access denied", "not enough memory",
+      case ERROR_INVALID_FUNCTION:
-"bad format", "no more files",  "access beyond EOF", "no space left on device", 
+          return "function not implemented";
-"invalid parameter", "no space left on device", "file exists", "operation cannot be completed",
+      case ERROR_FILE_NOT_FOUND:
-"unknown error"
+          return "file not found";
-};
+      case ERROR_ACCESS_DENIED:
-    switch (err) {
+          return "access denied";
-    case ERROR_INVALID_FUNCTION:
+      case ERROR_NOT_ENOUGH_MEMORY:
-        return strings[0].c_str();
+          return "not enough memory";
-    case ERROR_FILE_NOT_FOUND:
+      case ERROR_BAD_FORMAT:
-        return strings[1].c_str();
+          return "bad format";
-    case ERROR_ACCESS_DENIED:
+      case ERROR_NO_MORE_FILES:
-        return strings[2].c_str();
+          return "no more files";
-    case ERROR_NOT_ENOUGH_MEMORY:
+      case ERROR_HANDLE_EOF:
-        return strings[3].c_str();
+          return "access beyond EOF";
-    case ERROR_BAD_FORMAT:
+      case ERROR_INVALID_PARAMETER:
-        return strings[4].c_str();
+          return "invalid parameter";
-    case ERROR_NO_MORE_FILES:
+      case ERROR_HANDLE_DISK_FULL:
-        return strings[5].c_str();
+      case ERROR_DISK_FULL:
-    case ERROR_HANDLE_EOF:
+          return "no space left on device";
-        return strings[6].c_str();
+      case ERROR_ALREADY_EXISTS:
-    case ERROR_HANDLE_DISK_FULL:
+          return "file exists";
-        return strings[7].c_str();
+      case ERROR_CAN_NOT_COMPLETE:
-    case ERROR_INVALID_PARAMETER:
+          return "operation cannot be completed";
-        return strings[8].c_str();
+      default:
-    case ERROR_DISK_FULL:
+          return "unknown error";
-        return strings[9].c_str();
-    case ERROR_ALREADY_EXISTS:
-        return strings[10].c_str();
-    case ERROR_CAN_NOT_COMPLETE:
-        return strings[11].c_str();
-    default:
-        return strings[12].c_str();
     }
 }
 

src/tools/stuffextract/StormLib/StormPortMac.cpp

@@ -15,7 +15,8 @@
 *
 ********************************************************************/
 
-#ifndef _WIN32 || _WIN64
+#if defined(__APPLE__) & defined( __MACH__)
+
 #include "StormPort.h"
 #include "StormLib.h"
 
@@ -269,7 +270,7 @@ int GetLastError()
 /********************************************************************
 *    ErrString
 ********************************************************************/
-char *ErrString(int err)
+const char *ErrString(int err)
 {
     switch (err) 
     {