r174 - trunk

[Petter Reinholdtsen]

Author: pere
Date: 2014-01-17 09:11:39 +0000 (Fri, 17 Jan 2014)
New Revision: 174

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/protos.h
Log:
Add Solaris support (use <sys/byteorder.h> instead of <byteswap.h>).
Patch from Rainer Orth.


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2014-01-14 09:45:18 UTC (rev 173)
+++ trunk/NEWS	2014-01-17 09:11:39 UTC (rev 174)
@@ -1,3 +1,7 @@
+New in 0.17 released 2014-XX-XX:
+ * Add Solaris support (use <sys/byteorder.h> instead of <byteswap.h>).
+   Patch from Rainer Orth.
+
 New in 0.16 released 2014-01-14:
  * Fixed all minor bugs discovered by Coverity.
  * Updated config.sub and config.guess from the GNU project.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2014-01-14 09:45:18 UTC (rev 173)
+++ trunk/configure.ac	2014-01-17 09:11:39 UTC (rev 174)
@@ -21,7 +21,7 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([getopt.h elf.h fcntl.h unistd.h link.h sys/link.h])
+AC_CHECK_HEADERS([getopt.h elf.h fcntl.h unistd.h link.h sys/link.h byteswap.h sys/byteorder.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

Modified: trunk/protos.h
===================================================================
--- trunk/protos.h	2014-01-14 09:45:18 UTC (rev 173)
+++ trunk/protos.h	2014-01-17 09:11:39 UTC (rev 174)
@@ -1,7 +1,14 @@
 #ifndef PROTOS_H
 #define PROTOS_H
 
+#ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
+#elif defined(HAVE_SYS_BYTEORDER_H)
+#include <sys/byteorder.h>
+#define bswap_16 BSWAP_16
+#define bswap_32 BSWAP_32
+#define bswap_64 BSWAP_64
+#endif
 #include <elf.h>
 #include "config.h"