[Scummvm-cvs-logs] scummvm master -> 8b1a01b12d44dddfb8804cb71ddbbf0693722d58

[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:
8b1a01b12d GUI: Corrected fix for NDS compile failure...


Commit: 8b1a01b12d44dddfb8804cb71ddbbf0693722d58
    https://github.com/scummvm/scummvm/commit/8b1a01b12d44dddfb8804cb71ddbbf0693722d58
Author: D G Turner (digitall at scummvm.org)
Date: 2012-03-25T12:23:16-07:00

Commit Message:
GUI: Corrected fix for NDS compile failure...

Header needed to be in global, not GUI namespace.

Changed paths:
    gui/predictivedialog.cpp



diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 9b67855..a0b183f 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -34,6 +34,10 @@
 #include "common/file.h"
 #include "common/savefile.h"
 
+#ifdef __DS__
+#include "backends/platform/ds/arm9/source/wordcompletion.h"
+#endif
+
 using namespace Common;
 
 namespace GUI {
@@ -825,10 +829,6 @@ void PredictiveDialog::addWordToDict() {
 	}
 }
 
-#ifdef __DS__
-#include "backends/platform/ds/arm9/source/wordcompletion.h"
-#endif
-
 void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict) {
 	int lines = 0;
 
@@ -918,4 +918,4 @@ void PredictiveDialog::pressEditText() {
 	_edittext->draw();
 }
 
-} // namespace GUI
\ No newline at end of file
+} // namespace GUI