aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/cloud/dropbox/dropboxstorage.cpp6
-rw-r--r--backends/cloud/storage.cpp2
-rw-r--r--backends/cloud/storage.h5
-rw-r--r--base/version.cpp2
-rw-r--r--common/module.mk3
-rw-r--r--common/system.h2
6 files changed, 9 insertions, 11 deletions
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index b841575bf6..a8e3076aae 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -28,7 +28,8 @@ void example1();
void example2();
void example3();
-namespace Cloud { namespace Dropbox {
+namespace Cloud {
+namespace Dropbox {
void DropboxStorage::handler() {
if (_firstTime) {
@@ -48,7 +49,8 @@ void DropboxStorage::syncSaves() {
setTimeout(1000000); //in one second
}
-} } //end of namespace Cloud::Dropbox
+} //end of namespace Dropbox
+} //end of namespace Cloud
/// SimpleJSON examples:
diff --git a/backends/cloud/storage.cpp b/backends/cloud/storage.cpp
index 3272ecf760..ca6b9bf70e 100644
--- a/backends/cloud/storage.cpp
+++ b/backends/cloud/storage.cpp
@@ -26,7 +26,7 @@
namespace Cloud {
-void cloudThread(void *thread) {
+static void cloudThread(void *thread) {
Storage *cloudThread = (Storage *)thread;
cloudThread->handler();
}
diff --git a/backends/cloud/storage.h b/backends/cloud/storage.h
index 4afa36f8d8..e71b8b7aa0 100644
--- a/backends/cloud/storage.h
+++ b/backends/cloud/storage.h
@@ -28,7 +28,7 @@
namespace Cloud {
class Storage {
- friend void cloudThread(void*); //calls handler()
+ friend void cloudThread(void *); //calls handler()
protected:
virtual void handler();
@@ -45,7 +45,8 @@ public:
* @param path directory to list
*/
- //TODO: actually make it list directories and some callback to pass gathered files list
+ //TODO: actually make it list directories
+ //TODO: add some callback to pass gathered files list
virtual void listDirectory(Common::String path) = 0;
diff --git a/base/version.cpp b/base/version.cpp
index b2a7111a87..d40dd573f0 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -160,7 +160,7 @@ const char *gScummVMFeatures = ""
#ifdef USE_LIBCURL
"servers"
#ifdef USE_SDL_NET
- " "
+ ", "
#endif
#endif
#ifdef USE_SDL_NET
diff --git a/common/module.mk b/common/module.mk
index 7118ea36ff..54aa16f557 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -62,8 +62,5 @@ MODULE_OBJS += \
updates.o
endif
-ifdef USE_CLOUD
-endif
-
# Include common rules
include $(srcdir)/rules.mk
diff --git a/common/system.h b/common/system.h
index b24bc0a875..a3092e794f 100644
--- a/common/system.h
+++ b/common/system.h
@@ -56,9 +56,7 @@ class HardwareInputSet;
class Keymap;
class KeymapperDefaultBindings;
#endif
-#if defined(USE_CLOUD)
class CloudManager;
-#endif
}
class AudioCDManager;