Index: rpm-4.9.1.3/lib/header.c
===================================================================
--- rpm-4.9.1.3.orig/lib/header.c	2012-04-03 15:54:11.000000000 +0200
+++ rpm-4.9.1.3/lib/header.c	2012-09-25 09:05:40.000000000 +0200
@@ -101,6 +101,7 @@
 #define	ENTRY_IN_REGION(_e)	((_e)->info.offset < 0)
 
 /* Convert a 64bit value to network byte order. */
+#ifndef htonll
 static uint64_t htonll( uint64_t n ) {
     uint32_t *i = (uint32_t*)&n;
     uint32_t b = i[0];
@@ -108,6 +109,7 @@
     i[1] = htonl(b);
     return n;
 }
+#endif
 
 Header headerLink(Header h)
 {