|
@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
|
// Be mindful of what you include here!
|
|
|
#include <string>
|
|
|
+#include "config.h"
|
|
|
#include "irrlichttypes.h" // u64
|
|
|
#include "debug.h"
|
|
|
#include "constants.h"
|
|
@@ -70,21 +71,7 @@ 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
|
|
|
+#if !HAVE_STRLCPY
|
|
|
#define strlcpy(d, s, n) mystrlcpy(d, s, n)
|
|
|
#endif
|
|
|
|