git repos / saland

commit 35515503

sago007 · 2018-03-24 10:04
3551550339e0d77b94a670c14272025d2edf83c8 patch · browse files
parent afb751730b8ea8b98c90c710812e8ced46ab3fb8

Update the PlatformFolders library

Changed files

M src/sago/platform_folders.cpp before
M src/sago/platform_folders.h before
diff --git a/src/sago/platform_folders.cpp b/src/sago/platform_folders.cpp index 316ec72..004ceac 100644 --- a/src/sago/platform_folders.cpp +++ b/src/sago/platform_folders.cpp
@@ -112,10 +112,10 @@ static void throwOnRelative(const char* envName, const char* envValue) {
}
/**
- * Retrives the effective user's home dir.
- * If the user is running as root we ignore the HOME environment. It works badly with sudo.
+ * Retrives the effective user's home dir.
+ * If the user is running as root we ignore the HOME environment. It works badly with sudo.
* Writing to $HOME as root implies security concerns that a multiplatform program cannot be assumed to handle.
- * @return The home directory. HOME environment is respected for non-root users if it exists.
+ * @return The home directory. HOME environment is respected for non-root users if it exists.
*/
static std::string getHome() {
std::string res;
diff --git a/src/sago/platform_folders.h b/src/sago/platform_folders.h index 0e3ef4a..73fba85 100644 --- a/src/sago/platform_folders.h +++ b/src/sago/platform_folders.h
@@ -27,7 +27,7 @@ SOFTWARE.
*/
#ifndef SAGO_PLATFORM_FOLDERS_H
-#define SAGO_PLATFORM_FOLDERS_H
+#define SAGO_PLATFORM_FOLDERS_H
#include <vector>
#include <string>
@@ -162,11 +162,14 @@ public:
private:
PlatformFolders(const PlatformFolders&);
PlatformFolders& operator=(const PlatformFolders&);
+#if defined(_WIN32)
+#elif defined(__APPLE__)
+#else
struct PlatformFoldersData;
PlatformFoldersData *data;
+#endif
};
} //namespace sago
-#endif /* PLATFORM_FOLDERS_H */
-
+#endif /* PLATFORM_FOLDERS_H */