diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 12:32:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-08 16:26:36 +0200 |
| commit | f44850b5c3464cdda0ee9b1ee858d95f3ffaa3e2 (patch) | |
| tree | 580aa25716bfc88d57f15ad68f7bfa727aebc400 /src/3rdparty/sha3/brg_endian.h | |
| parent | f955bd8ced8b93d142b7f755665946424c6d3644 (diff) | |
| parent | 3622ebaac51abd2e4d1541120ae3b6e42932359f (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/3rdparty/sha3/brg_endian.h')
| -rw-r--r-- | src/3rdparty/sha3/brg_endian.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/sha3/brg_endian.h b/src/3rdparty/sha3/brg_endian.h index 09d2a8b6a9..9bb306e678 100644 --- a/src/3rdparty/sha3/brg_endian.h +++ b/src/3rdparty/sha3/brg_endian.h @@ -42,7 +42,7 @@ Changes for ARM 9/9/2010 [Downstream relative to Gladman's GitHub, upstream to Q #elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ ) # if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX) # include <endian.h> -# if !defined( __BEOS__ ) +# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) # include <byteswap.h> # endif # endif |