[Qemu-devel] [5886] Attached patch makes NetBSD use the native bswap functions

[Blue Swirl]

Revision: 5886
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5886
Author:   blueswir1
Date:     2008-12-05 17:54:09 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
Attached patch makes NetBSD use the native bswap functions
which compile.

Signed-off-by: Christoph Egger <address@hidden>

Modified Paths:
--------------
    trunk/bswap.h
    trunk/configure

Modified: trunk/bswap.h
===================================================================
--- trunk/bswap.h       2008-12-05 17:53:21 UTC (rev 5885)
+++ trunk/bswap.h       2008-12-05 17:54:09 UTC (rev 5886)
@@ -5,6 +5,12 @@
 
 #include <inttypes.h>
 
+#ifdef HAVE_MACHINE_BSWAP_H
+#include <sys/endian.h>
+#include <sys/types.h>
+#include <machine/bswap.h>
+#else
+
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #else
@@ -58,6 +64,8 @@
     return bswap_64(x);
 }
 
+#endif /* ! HAVE_MACHINE_BSWAP_H */
+
 static inline void bswap16s(uint16_t *s)
 {
     *s = bswap16(*s);

Modified: trunk/configure
===================================================================
--- trunk/configure     2008-12-05 17:53:21 UTC (rev 5885)
+++ trunk/configure     2008-12-05 17:54:09 UTC (rev 5886)
@@ -1229,6 +1229,15 @@
   if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
     echo "#define HAVE_BYTESWAP_H 1" >> $config_h
   fi
+  cat > $TMPC << EOF
+#include <sys/endian.h>
+#include <sys/types.h>
+#include <machine/bswap.h>
+int main(void) { return bswap32(0); }
+EOF
+  if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
+    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+  fi
 fi
 
 if [ "$openbsd" = "yes" ] ; then