summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Svetkin <mikhail.svetkin@qt.io>2018-03-20 14:32:54 +0100
committerMikhail Svetkin <mikhail.svetkin@qt.io>2019-07-01 02:04:19 +0200
commit222b81f5dac2a5d32027b15d3a784819291431f6 (patch)
treed59492e8b27da0882bf80af8dd1ebd03eb7fb4b1
parent248e81a28028b1b0570ffe0ed2e0edbf63a0a21c (diff)
rtems: Fix missing some ernno defines
By default RTEMS does not support linux extensions for errno. Enable it for build. Change-Id: I43b346794b99ac0ed339bfbe6e39684071615503 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ryan Chu <ryan.chu@qt.io>
-rw-r--r--mkspecs/common/rtems/qplatformdefs.h4
-rw-r--r--src/corelib/kernel/qcore_unix_p.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/common/rtems/qplatformdefs.h b/mkspecs/common/rtems/qplatformdefs.h
index 1baa7c7d74..b4ec1de87f 100644
--- a/mkspecs/common/rtems/qplatformdefs.h
+++ b/mkspecs/common/rtems/qplatformdefs.h
@@ -57,8 +57,10 @@
#include <pwd.h>
#include <grp.h>
-#include "../posix/qplatformdefs.h"
+#define __LINUX_ERRNO_EXTENSIONS__
+#include <errno.h>
+#include "../posix/qplatformdefs.h"
#ifdef __STRICT_ANSI__
#undef __STRICT_ANSI__
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index b56c2b9732..6ec7d28318 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -52,8 +52,8 @@
// We mean it.
//
-#include <QtCore/private/qglobal_p.h>
#include "qplatformdefs.h"
+#include <QtCore/private/qglobal_p.h>
#include "qatomic.h"
#include "qbytearray.h"