src/network/connection.h: Fix race condition

[minetest.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index b5a5d00f284120184e4cb1ffba0b53fb94181111..2a91fdd063245816e02f55a9e390002ec220830f 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 
 #include <string>
+#include <vector>
 #include "irrlicht.h"
 #include "irrlichttypes.h" // u32
 #include "irrlichttypes_extrabloated.h"
@@ -53,13 +54,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifdef _WIN32
        #include <windows.h>
-       
+
        #define sleep_ms(x) Sleep(x)
 #else
        #include <unistd.h>
        #include <stdint.h> //for uintptr_t
-       
-       #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE)
+
+       #if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
                #define _GNU_SOURCE
        #endif
 
@@ -79,7 +80,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #endif
 
        #define sleep_ms(x) usleep(x*1000)
-       
+
        #define THREAD_PRIORITY_LOWEST       0
        #define THREAD_PRIORITY_BELOW_NORMAL 1
        #define THREAD_PRIORITY_NORMAL       2
@@ -197,17 +198,17 @@ void initIrrlicht(irr::IrrlichtDevice * );
        #define _WIN32_WINNT 0x0501
 #endif
        #include <windows.h>
-       
+
        inline u32 getTimeS()
        {
                return GetTickCount() / 1000;
        }
-       
+
        inline u32 getTimeMs()
        {
                return GetTickCount();
        }
-       
+
        inline u32 getTimeUs()
        {
                LARGE_INTEGER freq, t;
@@ -215,7 +216,7 @@ void initIrrlicht(irr::IrrlichtDevice * );
                QueryPerformanceCounter(&t);
                return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000.0);
        }
-       
+
        inline u32 getTimeNs()
        {
                LARGE_INTEGER freq, t;
@@ -223,11 +224,11 @@ void initIrrlicht(irr::IrrlichtDevice * );
                QueryPerformanceCounter(&t);
                return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000000.0);
        }
-       
+
 #else // Posix
 #include <sys/time.h>
 #include <time.h>
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
 #include <mach/clock.h>
 #include <mach/mach.h>
 #endif
@@ -238,26 +239,26 @@ void initIrrlicht(irr::IrrlichtDevice * );
                gettimeofday(&tv, NULL);
                return tv.tv_sec;
        }
-       
+
        inline u32 getTimeMs()
        {
                struct timeval tv;
                gettimeofday(&tv, NULL);
                return tv.tv_sec * 1000 + tv.tv_usec / 1000;
        }
-       
+
        inline u32 getTimeUs()
        {
                struct timeval tv;
                gettimeofday(&tv, NULL);
                return tv.tv_sec * 1000000 + tv.tv_usec;
        }
-       
+
        inline u32 getTimeNs()
        {
                struct timespec ts;
                // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
                clock_serv_t cclock;
                mach_timespec_t mts;
                host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
@@ -270,7 +271,7 @@ void initIrrlicht(irr::IrrlichtDevice * );
 #endif
                return ts.tv_sec * 1000000000 + ts.tv_nsec;
        }
-       
+
        /*#include <sys/timeb.h>
        inline u32 getTimeMs()
        {
@@ -357,7 +358,7 @@ inline u32 getDeltaMs(u32 old_time_ms, u32 new_time_ms)
        inline void setThreadName(const char *name) {
                pthread_setname_np(name);
        }
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(__GNU__)
        inline void setThreadName(const char* name) {}
 #else
        #warning "Unrecognized platform, thread names will not be available."
@@ -369,9 +370,69 @@ float getDisplayDensity();
 
 v2u32 getDisplaySize();
 v2u32 getWindowSize();
+
+std::vector<core::vector3d<u32> > getSupportedVideoModes();
+std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers();
+const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type);
+const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type);
 #endif
 
+inline const char *getPlatformName()
+{
+       return
+#if defined(ANDROID)
+       "Android"
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+       "Linux"
+#elif defined(_WIN32) || defined(_WIN64)
+       "Windows"
+#elif defined(__DragonFly__) || defined(__FreeBSD__) || \
+               defined(__NetBSD__) || defined(__OpenBSD__)
+       "BSD"
+#elif defined(__APPLE__) && defined(__MACH__)
+       #if TARGET_OS_MAC
+               "OSX"
+       #elif TARGET_OS_IPHONE
+               "iOS"
+       #else
+               "Apple"
+       #endif
+#elif defined(_AIX)
+       "AIX"
+#elif defined(__hpux)
+       "HP-UX"
+#elif defined(__sun) || defined(sun)
+       #if defined(__SVR4)
+               "Solaris"
+       #else
+               "SunOS"
+       #endif
+#elif defined(__CYGWIN__)
+       "Cygwin"
+#elif defined(__unix__) || defined(__unix)
+       #if defined(_POSIX_VERSION)
+               "Posix"
+       #else
+               "Unix"
+       #endif
+#else
+       "?"
+#endif
+       ;
+}
+
+void setXorgClassHint(const video::SExposedVideoData &video_data,
+       const std::string &name);
+
+// This only needs to be called at the start of execution, since all future
+// threads in the process inherit this exception handler
+void setWin32ExceptionHandler();
+
 } // namespace porting
 
+#ifdef __ANDROID__
+#include "porting_android.h"
+#endif
+
 #endif // PORTING_HEADER