[Scummvm-git-logs] scummvm master -> ca92641345b280d346ba895f95a8ceb46530dd2b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ca92641345 Revert "SCI: Fix Symbian compilation."


Commit: ca92641345b280d346ba895f95a8ceb46530dd2b
    https://github.com/scummvm/scummvm/commit/ca92641345b280d346ba895f95a8ceb46530dd2b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-27T14:20:16+02:00

Commit Message:
Revert "SCI: Fix Symbian compilation."

This reverts commit ee6c7153cb7c0b7cd9cfa26e0d206f5337210f5b.

This is not portable solution and produces tons of warnings
because the named va-args are GCC extension

Changed paths:
    engines/sci/resource/resource_patcher.cpp


diff --git a/engines/sci/resource/resource_patcher.cpp b/engines/sci/resource/resource_patcher.cpp
index c1da99f773..ad16e5f84b 100644
--- a/engines/sci/resource/resource_patcher.cpp
+++ b/engines/sci/resource/resource_patcher.cpp
@@ -39,7 +39,7 @@ namespace Sci {
 #else
 #define _PACKINT32(n) (((uint32)n) >> 24 & 0xFF), (((uint32)n) >> 16 & 0xFF), (((uint32)n) >> 8 & 0xFF), (((uint32)n) & 0xFF)
 #endif
-#define _BYTEOP(op, numBytes, ARGS...) op, _PACKINT32(numBytes), ##ARGS
+#define _BYTEOP(op, numBytes, ...) op, _PACKINT32(numBytes), __VA_ARGS__
 #define _NUMBEROP(op, type, value) op, sizeof(type), _PACKINT32(value)
 #define _FILLOP(op, numBytes, value) op, _PACKINT32(numBytes), value
 // End of internal resource patcher macros
@@ -52,12 +52,12 @@ namespace Sci {
 /**
  * Replaces data at the current position.
  */
-#define REPLACE(numBytes, ARGS...) _BYTEOP(kReplaceBytes, numBytes, ##ARGS)
+#define REPLACE(numBytes, ...) _BYTEOP(kReplaceBytes, numBytes, __VA_ARGS__)
 
 /**
  * Inserts new data at the current position.
  */
-#define INSERT(numBytes, ARGS...) _BYTEOP(kInsertBytes, numBytes, ##ARGS)
+#define INSERT(numBytes, ...) _BYTEOP(kInsertBytes, numBytes, __VA_ARGS__)
 
 /**
  * Replaces a number of the given type at the current position with the given