From: Jim Meyering <meyering@redhat.com>
Date: Tue, 28 Jun 2011 18:09:50 +0000 (+0200)
Subject: maint: remove now-unnecessary #ifdef HAVE_BYTESWAP_H guard
X-Git-Tag: 1.2.8~15
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ae748799b816aadc200ccbada1bed3b3ce13bd5c;p=hivex.git

maint: remove now-unnecessary #ifdef HAVE_BYTESWAP_H guard

* lib/byte_conversions.h: Remove #ifdef HAVE_BYTESWAP_H guard.
With gnulib, we're guaranteed to have that header file.
* bootstrap (modules): Use the byteswap module.
---

diff --git a/bootstrap b/bootstrap
index 638d230..79b6717 100755
--- a/bootstrap
+++ b/bootstrap
@@ -55,6 +55,7 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
 modules='
+byteswap
 c-ctype
 fcntl
 full-read
diff --git a/lib/byte_conversions.h b/lib/byte_conversions.h
index 84e9e2d..aa4ffe6 100644
--- a/lib/byte_conversions.h
+++ b/lib/byte_conversions.h
@@ -18,9 +18,7 @@
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
 #endif
-#ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
-#endif
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #ifndef be32toh