From: Mark Wielaard <mjw@redhat.com>
Date: Mon, 25 Aug 2014 20:25:37 +0000 (+0200)
Subject: Merge branch 'master' into portable
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c56b49c8490f16c51825c17736f0fb4a119d6eee;p=thirdparty%2Felfutils.git

Merge branch 'master' into portable
---

c56b49c8490f16c51825c17736f0fb4a119d6eee
diff --cc libdwfl/linux-core-attach.c
index 981086ee9,5a7b3b3da..d05ac7e0a
--- a/libdwfl/linux-core-attach.c
+++ b/libdwfl/linux-core-attach.c
@@@ -29,36 -29,9 +29,38 @@@
  #include "libdwflP.h"
  #include <fcntl.h>
  #include "system.h"
 +#include <endian.h>
 +#include <byteswap.h>
 +#if __BYTE_ORDER == __LITTLE_ENDIAN
 +# ifndef be64toh
 +#  define be64toh(x) bswap_64 (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) bswap_32 (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) (x)
 +# endif
 +#else
 +# ifndef be64toh
 +#  define be64toh(x) (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) bswap_64 (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) bswap_32 (x)
 +# endif
 +#endif
  
+ #include "../libdw/memory-access.h"
+ 
  #ifndef MIN
  # define MIN(a, b) ((a) < (b) ? (a) : (b))
  #endif