Merge pull request #533 from rest-for-physics/lobis-unistd-header-inc…

…lude Explicitly include unistd.h
rest-for-physics · Jul 18, 2024 · 84a7760 · 84a7760
2 parents 2ffc29d + 5c481ad
commit 84a7760
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/source/framework/core/inc/TRestMetadata.h b/source/framework/core/inc/TRestMetadata.h
@@ -43,6 +43,10 @@
 #include "TRestVersion.h"
 #include "tinyxml.h"
 
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
 /* We keep using REST_RELEASE, REST_VERSION(2,X,Y) and REST_VERSION_CODE
    to determine the installed REST version and avoid too much prototyping
 

diff --git a/source/framework/core/src/TRestGDMLParser.cxx b/source/framework/core/src/TRestGDMLParser.cxx
@@ -1,9 +1,6 @@
 #include "TRestGDMLParser.h"
 
 #include <filesystem>
-#ifdef __APPLE__
-#include <unistd.h>
-#endif
 
 using namespace std;
 

diff --git a/source/framework/core/src/startup.cpp b/source/framework/core/src/startup.cpp
@@ -4,10 +4,6 @@
 #include <Windows.h>
 #endif  // WIN32
 
-#ifdef __APPLE__
-#include <unistd.h>
-#endif
-
 #include "RVersion.h"
 #include "TEnv.h"
 #include "TRestDataBase.h"

diff --git a/source/framework/tools/inc/TRestTools.h b/source/framework/tools/inc/TRestTools.h
@@ -42,6 +42,10 @@
 #define EXTERN_IMP
 #endif
 
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
 const std::string PARAMETER_NOT_FOUND_STR = "NO_SUCH_PARA";
 const double PARAMETER_NOT_FOUND_DBL = -99999999;
 

diff --git a/source/framework/tools/src/TRestStringOutput.cxx b/source/framework/tools/src/TRestStringOutput.cxx
@@ -9,10 +9,6 @@ using namespace std;
 #include <conio.h>
 #endif  // WIN32
 
-#ifdef __APPLE__
-#include <unistd.h>
-#endif
-
 int Console::GetWidth() {
 #ifdef WIN32
     CONSOLE_SCREEN_BUFFER_INFO csbi;