[Scummvm-git-logs] scummvm master -> 27e6a28e4e6d8b34f34278d8d427ac6b59d48562

[Mataniko]

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:
27e6a28e4e BACKENDS: Fix compilation with SDL_Net enabled and cloud support disabled


Commit: 27e6a28e4e6d8b34f34278d8d427ac6b59d48562
    https://github.com/scummvm/scummvm/commit/27e6a28e4e6d8b34f34278d8d427ac6b59d48562
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-04-02T12:02:21-04:00

Commit Message:
BACKENDS: Fix compilation with SDL_Net enabled and cloud support disabled

Changed paths:
    backends/saves/default/default-saves.cpp
    backends/saves/default/default-saves.h


diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp
index a0c5470..8973101 100644
--- a/backends/saves/default/default-saves.cpp
+++ b/backends/saves/default/default-saves.cpp
@@ -29,8 +29,9 @@
 
 #if defined(USE_CLOUD) && defined(USE_LIBCURL)
 #include "backends/cloud/cloudmanager.h"
-#include "common/file.h"
 #endif
+#include "common/file.h"
+#include "common/system.h"
 
 #if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
 
@@ -369,6 +370,8 @@ void DefaultSaveFileManager::saveTimestamps(Common::HashMap<Common::String, uint
 	f.close();
 }
 
+#endif // ifdef USE_LIBCURL
+
 Common::String DefaultSaveFileManager::concatWithSavesPath(Common::String name) {
 	DefaultSaveFileManager *manager = dynamic_cast<DefaultSaveFileManager *>(g_system->getSavefileManager());
 	Common::String path = (manager ? manager->getSavePath() : ConfMan.get("savepath"));
@@ -385,6 +388,4 @@ Common::String DefaultSaveFileManager::concatWithSavesPath(Common::String name)
 	return path + '/' + name;
 }
 
-#endif // ifdef USE_LIBCURL
-
 #endif // !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
diff --git a/backends/saves/default/default-saves.h b/backends/saves/default/default-saves.h
index f245381..2801dd5 100644
--- a/backends/saves/default/default-saves.h
+++ b/backends/saves/default/default-saves.h
@@ -52,10 +52,10 @@ public:
 
 	static Common::HashMap<Common::String, uint32> loadTimestamps();
 	static void saveTimestamps(Common::HashMap<Common::String, uint32> &timestamps);
-	static Common::String concatWithSavesPath(Common::String name);
-
 #endif
 
+	static Common::String concatWithSavesPath(Common::String name);
+
 protected:
 	/**
 	 * Get the path to the savegame directory.