removed duplicate ifdef code

modio · Sep 11, 2018 · b665615 · b665615
1 parent 12102c2
commit b665615
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 34 deletions.
diff --git a/examples/code-samples/c++/49_DownloadsControl.cpp b/examples/code-samples/c++/49_DownloadsControl.cpp
@@ -37,7 +37,7 @@ int main(void)
   {
     modio_instance.sleep(10);
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
     system("cls");
 #endif
 

diff --git a/include/Utility.h b/include/Utility.h
@@ -2,24 +2,24 @@
 #define MODIO_UTILITY_H
 
 #ifdef __linux__
-#define LINUX
+#define MODIO_LINUX_DETECTED
 #endif
 
 #ifdef __APPLE__
-#define OSX
+#define MODIO_OSX_DETECTED
 #endif
 #ifdef __MACH__
-#define OSX
+#define MODIO_OSX_DETECTED
 #endif
 
 #ifdef _WIN32
-#define WINDOWS
+#define MODIO_WINDOWS_DETECTED
 #endif
 #ifdef _WIN64
-#define WINDOWS
+#define MODIO_WINDOWS_DETECTED
 #endif
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
 #ifdef BUILDING_MODIO_DLL
 #define MODIO_DLL __declspec(dllexport)
 #else
@@ -38,19 +38,19 @@
 #include "dependencies/json/json.hpp"
 #include "Globals.h"
 
-#ifdef LINUX
+#ifdef MODIO_LINUX_DETECTED
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
 #endif
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
 #include <windows.h>
 #include <strsafe.h>
 #include "dependencies/dirent/dirent.h"
 #endif
 
-#ifdef OSX
+#ifdef MODIO_OSX_DETECTED
 #include <sys/stat.h>
 #include <dirent.h>
 #endif

diff --git a/include/c/creators/ModioFilterCreator.h b/include/c/creators/ModioFilterCreator.h
@@ -8,7 +8,7 @@
 #include "../ModioC.h"
 #include "../schemas/ModioListNode.h"
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
 #  ifdef BUILDING_MODIO_DLL
 #    define MODIO_DLL __declspec(dllexport)
 #  else

diff --git a/src/Utility.cpp b/src/Utility.cpp
@@ -148,7 +148,7 @@ void writeJson(std::string file_path, nlohmann::json json_object)
 
 // Filesystem methods
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
 void writeLastErrorLog(std::string error_function)
 {
   //Get the error message, if any.
@@ -177,27 +177,20 @@ void writeLastErrorLog(std::string error_function)
 
 void removeEmptyDirectory(std::string path)
 {
-#ifdef LINUX
+#if defined(MODIO_LINUX_DETECTED) || defined(MODIO_OSX_DETECTED)
   if (remove(path.c_str()))
     writeLogLine(path + " removed", MODIO_DEBUGLEVEL_LOG);
   else
     writeLogLine("Could not remove " + path, MODIO_DEBUGLEVEL_ERROR);
 #endif
 
-#ifdef OSX
-  if (remove(path.c_str()))
-    writeLogLine(path + " removed", MODIO_DEBUGLEVEL_LOG);
-  else
-    writeLogLine("Could not remove " + path, MODIO_DEBUGLEVEL_ERROR);
-#endif
-
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
   if (!RemoveDirectory(path.c_str()))
     writeLastErrorLog("RemoveDirectory");
 #endif
 }
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
 int deleteDirectoryWindows(const std::string &refcstrRootDirectory)
 {
   HANDLE hFile;                    // Handle to directory
@@ -300,23 +293,19 @@ std::vector<std::string> getFilenames(std::string directory)
 void createDirectory(std::string directory)
 {
   writeLogLine("Creating directory " + directory, MODIO_DEBUGLEVEL_LOG);
-#ifdef LINUX
-  mkdir(directory.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-#endif
-
-#ifdef OSX
+#if defined(MODIO_LINUX_DETECTED) || defined(MODIO_OSX_DETECTED)
   mkdir(directory.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 #endif
 
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
   if (!CreateDirectory((char *)directory.c_str(), NULL))
     writeLastErrorLog("CreateDirectory");
 #endif
 }
 
 bool removeDirectory(std::string directory_name)
 {
-#ifdef WINDOWS
+#ifdef MODIO_WINDOWS_DETECTED
   int error_code = deleteDirectoryWindows(directory_name);
   if (error_code != 0)
     modio::writeLogLine("Could not remove directory, error code: " + modio::toString(error_code), MODIO_DEBUGLEVEL_ERROR);

diff --git a/src/modio.cpp b/src/modio.cpp
@@ -108,13 +108,11 @@ void modioProcess()
 
 void modioSleep(u32 milliseconds)
 {
-  #ifdef LINUX
+  #if defined(MODIO_LINUX_DETECTED) || defined(MODIO_OSX_DETECTED)
     usleep(milliseconds * 1000);
   #endif
-  #ifdef WINDOWS
+
+  #ifdef MODIO_WINDOWS_DETECTED
     Sleep(milliseconds);
   #endif
-  #ifdef OSX
-    usleep(milliseconds * 1000);
-  #endif
 }