[Scummvm-cvs-logs] scummvm master -> f6e59149211ae5762cc8f8048c43ee9b874f3ab1

[clone2727]

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:
f6e5914921 SHERLOCK: Fix use of preprocessor token concatenation


Commit: f6e59149211ae5762cc8f8048c43ee9b874f3ab1
    https://github.com/scummvm/scummvm/commit/f6e59149211ae5762cc8f8048c43ee9b874f3ab1
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-27T01:29:53-04:00

Commit Message:
SHERLOCK: Fix use of preprocessor token concatenation

Changed paths:
    engines/sherlock/fixed_text.h



diff --git a/engines/sherlock/fixed_text.h b/engines/sherlock/fixed_text.h
index 32a5266..6542301 100644
--- a/engines/sherlock/fixed_text.h
+++ b/engines/sherlock/fixed_text.h
@@ -28,7 +28,7 @@
 
 namespace Sherlock {
 
-#define FIXED(MSG) _vm->_fixedText->getText(kFixedText_##MSG##)
+#define FIXED(MSG) _vm->_fixedText->getText(kFixedText_##MSG)
 
 enum FixedTextActionId {
 	kFixedTextAction_Invalid = -1,