summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--firmware/include/rbendian.h2
-rwxr-xr-xtools/configure7
2 files changed, 7 insertions, 2 deletions
diff --git a/firmware/include/rbendian.h b/firmware/include/rbendian.h
index 0e941b8f06..7b666eca56 100644
--- a/firmware/include/rbendian.h
+++ b/firmware/include/rbendian.h
@@ -23,7 +23,7 @@
#include "config.h"
-#ifdef SIM_USE_BYTESWAP_H
+#ifdef OS_USE_BYTESWAP_H
#include <byteswap.h>
#endif
diff --git a/tools/configure b/tools/configure
index 6398c48d06..a7635a8460 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4394,6 +4394,7 @@ fi
;;
[Cc])
uname=`uname`
+ checkwps="yes"
simcc "checkwps"
toolset='';
t_cpu='';
@@ -4474,9 +4475,13 @@ fi
if [ "yes" = "$simulator" ]; then
echo Unsetting APPLICATION define for SIMULATOR build
unset application
+fi
+
+# newer glibc implementations use byteswap.h
+if [ "$simulator" = "yes" ] || [ "$checkwps" = "yes" ]; then
if test -f "$BYTESWP"; then
echo Using "$BYTESWP"
- extradefines="$extradefines -DSIM_USE_BYTESWAP_H=$BYTESWP"
+ extradefines="$extradefines -DOS_USE_BYTESWAP_H=$BYTESWP"
fi
fi