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

[criezy]

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:
b2db0d910e SUPERNOVA: Attempt to fix compilation for Nintendo Switch


Commit: b2db0d910e21fc76439a0d03b6aed0aac23e6ada
    https://github.com/scummvm/scummvm/commit/b2db0d910e21fc76439a0d03b6aed0aac23e6ada
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2019-07-28T15:37:48+01:00

Commit Message:
SUPERNOVA: Attempt to fix compilation for Nintendo Switch

Changed paths:
    engines/supernova/msn_def.h


diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 6c5dcc0..a71e85a 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -23,6 +23,11 @@
 #ifndef SUPERNOVA_MSN_DEF_H
 #define SUPERNOVA_MSN_DEF_H
 
+// Avoid error on expansion of macro switch in the ObjectID enum below
+#ifdef SWITCH
+#undef SWITCH
+#endif
+
 #include "common/scummsys.h"
 
 namespace Supernova {