Fix macro ARRAYSIZE name collision on windows

[dragonfireclient.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index bcce96ef7f0bbb092ffedd546ac7567ba1da69c2..427fce129f31b610e962df63825935732d7040be 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -24,11 +24,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PORTING_HEADER
 #define PORTING_HEADER
 
+#ifdef _WIN32
+       #ifdef _WIN32_WINNT
+               #undef _WIN32_WINNT
+       #endif
+       #define _WIN32_WINNT 0x0501 // We need to do this before any other headers 
+               // because those might include sdkddkver.h which defines _WIN32_WINNT if not already set
+#endif
+
 #include <string>
 #include "irrlichttypes.h" // u32
 #include "debug.h"
 #include "constants.h"
 #include "gettime.h"
+#include "threads.h"
 
 #ifdef _MSC_VER
        #define SWPRINTF_CHARSTRING L"%S"
@@ -41,9 +50,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 //#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
 
 #ifdef _WIN32
-       #ifndef _WIN32_WINNT
-               #define _WIN32_WINNT 0x0500
-       #endif
        #include <windows.h>
        
        #define sleep_ms(x) Sleep(x)
@@ -86,6 +92,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define strtoll(x, y, z) _strtoi64(x, y, z)
        #define strtoull(x, y, z) _strtoui64(x, y, z)
        #define strcasecmp(x, y) stricmp(x, y)
+       #define strncasecmp(x, y, n) strnicmp(x, y, n)
 #else
        #define ALIGNOF(x) __alignof__(x)
 #endif
@@ -94,6 +101,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define strtok_r(x, y, z) mystrtok_r(x, y, z)
 #endif
 
+// strlcpy is missing from glibc.  thanks a lot, drepper.
+// strlcpy is also missing from AIX and HP-UX because they aim to be weird.
+// We can't simply alias strlcpy to MSVC's strcpy_s, since strcpy_s by
+// default raises an assertion error and aborts the program if the buffer is
+// too small.
+#if defined(__FreeBSD__) || defined(__NetBSD__)    || \
+       defined(__OpenBSD__) || defined(__DragonFly__) || \
+       defined(__APPLE__)   ||                           \
+       defined(__sun)       || defined(sun)           || \
+       defined(__QNX__)     || defined(__QNXNTO__)
+       #define HAVE_STRLCPY
+#endif
+
+// So we need to define our own.
+#ifndef HAVE_STRLCPY
+       #define strlcpy(d, s, n) mystrlcpy(d, s, n)
+#endif
+
 #define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
 
 namespace porting
@@ -147,12 +172,21 @@ bool threadBindToProcessor(threadid_t tid, int pnumber);
 */
 bool threadSetPriority(threadid_t tid, int prio);
 
+/*
+       Return system information
+       e.g. "Linux/3.12.7 x86_64"
+*/
+std::string get_sysinfo();
+
 /*
        Resolution is 10-20ms.
        Remember to check for overflows.
        Overflow can occur at any value higher than 10000000.
 */
 #ifdef _WIN32 // Windows
+#ifndef _WIN32_WINNT
+       #define _WIN32_WINNT 0x0501
+#endif
        #include <windows.h>
        
        inline u32 getTimeS()
@@ -237,6 +271,52 @@ inline u32 getTime(TimePrecision prec)
        return 0;
 }
 
+#if defined(linux) || defined(__linux)
+       #include <sys/prctl.h>
+
+       inline void setThreadName(const char *name) {
+               /* It would be cleaner to do this with pthread_setname_np,
+                * which was added to glibc in version 2.12, but some major
+                * distributions are still runing 2.11 and previous versions.
+                */
+               prctl(PR_SET_NAME, name);
+       }
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+       #include <pthread.h>
+
+       inline void setThreadName(const char *name) {
+               pthread_set_name_np(pthread_self(), name);
+       }
+#elif defined(_MSC_VER)
+       typedef struct tagTHREADNAME_INFO {
+               DWORD dwType; // must be 0x1000
+               LPCSTR szName; // pointer to name (in user addr space)
+               DWORD dwThreadID; // thread ID (-1=caller thread)
+               DWORD dwFlags; // reserved for future use, must be zero
+       } THREADNAME_INFO;
+
+       inline void setThreadName(const char *name) {
+               THREADNAME_INFO info;
+               info.dwType = 0x1000;
+               info.szName = name;
+               info.dwThreadID = -1;
+               info.dwFlags = 0;
+               __try {
+                       RaiseException(0x406D1388, 0, sizeof(info) / sizeof(DWORD), (DWORD *) &info);
+               } __except (EXCEPTION_CONTINUE_EXECUTION) {}
+       }
+#elif defined(__APPLE__)
+       #include <pthread.h>
+
+       inline void setThreadName(const char *name) {
+               pthread_setname_np(name);
+       }
+#elif defined(_WIN32)
+       inline void setThreadName(const char* name) {}
+#else
+       #warning "Unrecognized platform, thread names will not be available."
+       inline void setThreadName(const char* name) {}
+#endif
 
 } // namespace porting