summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-02 09:39:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-02 14:53:42 +0100
commit6896eb8dc44069808f5fef452c9802eaf0c51501 (patch)
tree36d97396ed6196eb97ad327875fe0661fb9caa3b /external
parentf2e1e4ff085962a08a5d7738325b383c07afcbbd (diff)
crashtesting: ended up using the wrong strerror_r
since... commit bbab833bd956e220db3548ddd0a00dfd30836de1 Date: Thu Oct 28 10:07:00 2021 +0100 endian check in internal neon looks dubious Change-Id: If96bb1bc1dda70f25fa49b3c68ee8993db7d9017 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124587 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/neon/configs/config.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index 8f225a3296ad..9ac5f6ce4c3f 100644
--- a/external/neon/configs/config.h
+++ b/external/neon/configs/config.h
@@ -1,7 +1,5 @@
/* Contents kept in sync with config.h.in from neon 0.31.2 */
-#include <osl/endian.h>
-
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -521,15 +519,21 @@
#undef __EXTENSIONS__
#endif
+/* Always defined to enable GNU extensions */
+#define _GNU_SOURCE 1
+
+/*
+ include osl/endian.h after _GNU_SOURCE because it includes other headers and we need
+ to ensure we get the strerror_r variant that returns char*
+*/
+#include <osl/endian.h>
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined OSL_BIGENDIAN
#define WORDS_BIGENDIAN 1
#endif
-/* Always defined to enable GNU extensions */
-#define _GNU_SOURCE 1
-
/* Define to 1 if on MINIX. */
/* #undef _MINIX */