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

[digitall]

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:
c5f2d0c1a7 STARTREK: Further Fix For Compilation.


Commit: c5f2d0c1a70f0ce16e0d5bb2bda1a0ee900aff46
    https://github.com/scummvm/scummvm/commit/c5f2d0c1a70f0ce16e0d5bb2bda1a0ee900aff46
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T11:09:01+01:00

Commit Message:
STARTREK: Further Fix For Compilation.

Changed paths:
    engines/startrek/text.cpp


diff --git a/engines/startrek/text.cpp b/engines/startrek/text.cpp
index 833b9e4..c30532e 100644
--- a/engines/startrek/text.cpp
+++ b/engines/startrek/text.cpp
@@ -1,4 +1,4 @@
-#include "common/c++11-compat.h" // nullptr definition
+#include "common/scummsys.h"
 
 // In this file, the TYPO tag is used when a typo is fixed in a piece of text, or when
 // text is changed to match the audio.
@@ -6,7 +6,7 @@
 namespace StarTrek {
 
 extern const char *const g_gameStrings[] = {
-	nullptr,
+	NULL,
 	"",
 	"Dialog error",
 	"Animation error",