Browse Source

Fixed missing definitions for the current working directory.

Former-commit-id: cc99143526
tempestpy_adaptions
PBerger 10 years ago
parent
commit
a49991484c
  1. 5
      src/utility/OsDetection.h

5
src/utility/OsDetection.h

@ -4,10 +4,12 @@
#if defined __linux__ || defined __linux #if defined __linux__ || defined __linux
# define LINUX # define LINUX
# include <sys/mman.h> # include <sys/mman.h>
# include <unistd.h>
#include <execinfo.h> // Required by ErrorHandling.h #include <execinfo.h> // Required by ErrorHandling.h
#include <cxxabi.h> // Required by ErrorHandling.h #include <cxxabi.h> // Required by ErrorHandling.h
#include <sys/time.h> // Required by storm.cpp, Memory Usage #include <sys/time.h> // Required by storm.cpp, Memory Usage
#include <sys/resource.h> // Required by storm.cpp, Memory Usage #include <sys/resource.h> // Required by storm.cpp, Memory Usage
# define GetCurrentDir getcwd
#elif defined TARGET_OS_MAC || defined __apple__ || defined __APPLE__ #elif defined TARGET_OS_MAC || defined __apple__ || defined __APPLE__
# define MACOSX # define MACOSX
# define _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE
@ -17,6 +19,7 @@
# include <cxxabi.h> // Required by ErrorHandling.h # include <cxxabi.h> // Required by ErrorHandling.h
# include <sys/time.h> // Required by storm.cpp, Memory Usage # include <sys/time.h> // Required by storm.cpp, Memory Usage
# include <sys/resource.h> // Required by storm.cpp, Memory Usage # include <sys/resource.h> // Required by storm.cpp, Memory Usage
# define GetCurrentDir getcwd
#elif defined _WIN32 || defined _WIN64 #elif defined _WIN32 || defined _WIN64
# define WINDOWS # define WINDOWS
# ifndef NOMINMAX # ifndef NOMINMAX
@ -28,8 +31,10 @@
# include <winnt.h> # include <winnt.h>
# include <DbgHelp.h> # include <DbgHelp.h>
# include <Psapi.h> # include <Psapi.h>
# include <direct.h>
# define strncpy strncpy_s # define strncpy strncpy_s
# define sscanf sscanf_s # define sscanf sscanf_s
# define GetCurrentDir _getcwd
// This disables Warning C4250 - Diamond Inheritance Dominance // This disables Warning C4250 - Diamond Inheritance Dominance
#pragma warning(disable:4250) #pragma warning(disable:4250)

Loading…
Cancel
Save