[Compat] Fix Generals WWUtil compilation

Co-authored-by: Patrick Zacharias <[email protected]>

Author: feliwir

Dependencies/Utility/Utility/intrin_compat.h

@@ -29,7 +29,7 @@ static inline uint32_t _lrotl(uint32_t value, int shift)
 
 static inline uint64_t _rdtsc()
 {
-#if _WIN32
+#ifdef _WIN32
     return __rdtsc();
 #elif defined(__has_builtin) && __has_builtin(__builtin_readcyclecounter)
     return __builtin_readcyclecounter();

Generals/Code/Libraries/Source/WWVegas/WWLib/mmsys.h

@@ -44,8 +44,10 @@
 ** This header just includes mmsystem.h with warning 4201 disabled
 */
 
+#ifdef _WIN32
 #pragma warning(disable:4201)
 #include <mmsystem.h>
 #pragma warning(default:4201)
+#endif
 
 #endif // MMSYS_H

Generals/Code/Libraries/Source/WWVegas/Wwutil/miscutil.cpp

@@ -119,8 +119,14 @@ bool cMiscUtil::File_Is_Read_Only(LPCSTR filename)
 {
    WWASSERT(filename != NULL);
 
-	DWORD attributes = ::GetFileAttributes(filename);
-	return ((attributes != 0xFFFFFFFF) && (attributes & FILE_ATTRIBUTE_READONLY));
+#ifdef _WIN32
+   DWORD attributes = ::GetFileAttributes(filename);
+   return ((attributes != 0xFFFFFFFF) && (attributes & FILE_ATTRIBUTE_READONLY));
+#else
+   bool readable = access(filename, R_OK) == 0;
+   bool writable = access(filename, W_OK) == 0;
+   return (readable && !writable);
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -165,6 +171,7 @@ void cMiscUtil::Get_File_Id_String(LPCSTR filename, StringClass & str)
 
 //	WWDEBUG_SAY(("cMiscUtil::Get_File_Id_String for %s\n", filename));
 
+#ifdef _WIN32
    //
    // Get size
    //
@@ -211,7 +218,7 @@ void cMiscUtil::Get_File_Id_String(LPCSTR filename, StringClass & str)
 	// Put all this data into a string
 	//
 	str.Format("%s %d %d", working_filename, filesize, time_date_stamp);
-
+#endif
 	//WWDEBUG_SAY(("File id string: %s\n", str));
 }
 
@@ -220,7 +227,11 @@ void cMiscUtil::Remove_File(LPCSTR filename)
 {
    WWASSERT(filename != NULL);
 
-	::DeleteFile(filename);
+#ifdef _WIN32
+   ::DeleteFile(filename);
+#else
+   ::remove(filename);
+#endif
 }
 
 

GeneralsMD/Code/Libraries/Source/WWVegas/Wwutil/miscutil.cpp

@@ -119,7 +119,7 @@ bool cMiscUtil::File_Is_Read_Only(LPCSTR filename)
 {
    WWASSERT(filename != NULL);
 
-#if _WIN32
+#ifdef _WIN32
 	DWORD attributes = ::GetFileAttributes(filename);
 	return ((attributes != 0xFFFFFFFF) && (attributes & FILE_ATTRIBUTE_READONLY));
 #else
@@ -171,7 +171,7 @@ void cMiscUtil::Get_File_Id_String(LPCSTR filename, StringClass & str)
 
 //	WWDEBUG_SAY(("cMiscUtil::Get_File_Id_String for %s\n", filename));
 
-#if _WIN32
+#ifdef _WIN32
    //
    // Get size
    //
@@ -227,7 +227,7 @@ void cMiscUtil::Remove_File(LPCSTR filename)
 {
    WWASSERT(filename != NULL);
 
-#if _WIN32
+#ifdef _WIN32
 	::DeleteFile(filename);
 #else
 	::remove(filename);