Permalink
Browse files

Move bswap.h to libmythbase

The calls for bswap_* in the audio code could not use the common bswap.h file
due to it being located in libmythtv.  I moved it to libmythbase so it can
be used.

Also, you will want to do a make distclean.  ABI version bumped.
  • Loading branch information...
1 parent fb90f73 commit 61495330be35d472527570dcc68617dba135e748 @Beirdo Beirdo committed May 9, 2012
@@ -4,17 +4,7 @@
#include "audiooutpututil.h"
#include <sys/types.h>
#include <inttypes.h>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#elif HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#elif CONFIG_DARWIN
-#include <libkern/OSByteOrder.h>
-#define bswap_16 OSSwapInt16
-#define bswap_32 OSSwapInt32
-#elif HAVE_BIGENDIAN
-#error No bswap functions defined
-#endif
+#include "bswap.h"
#define LOC QString("AOUtil: ")
@@ -27,18 +27,7 @@
#include "eldutils.h"
#include <sys/types.h>
#include <inttypes.h>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#elif HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#elif CONFIG_DARWIN
-#include <libkern/OSByteOrder.h>
-#define bswap_16 OSSwapInt16
-#define bswap_32 OSSwapInt32
-#define bswap_64 OSSwapInt64
-#elif HAVE_BIGENDIAN
-#error No bswap functions defined
-#endif
+#include "bswap.h"
#include "audiooutputbase.h"
#include <QString>
File renamed without changes.
@@ -24,7 +24,7 @@ HEADERS += mythmiscutil.h mythhdd.h mythcdrom.h autodeletedeque.h dbutil.h
HEADERS += mythhttppool.h mythhttphandler.h mythdeque.h mythlogging.h
HEADERS += mythbaseutil.h referencecounter.h version.h mythcommandlineparser.h
HEADERS += mythscheduler.h filesysteminfo.h hardwareprofile.h serverpool.h
-HEADERS += plist.h
+HEADERS += plist.h bswap.h
SOURCES += mthread.cpp mthreadpool.cpp
SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
@@ -66,7 +66,7 @@ inc.files += mythtranslation.h iso639.h iso3166.h mythmedia.h mythmiscutil.h
inc.files += mythcdrom.h autodeletedeque.h dbutil.h mythhttppool.h mythdeque.h
inc.files += referencecounter.h mythcommandlineparser.h mthread.h mthreadpool.h
inc.files += filesysteminfo.h hardwareprofile.h bonjourregister.h serverpool.h
-inc.files += plist.h
+inc.files += plist.h bswap.h
# Allow both #include <blah.h> and #include <libmythbase/blah.h>
inc2.path = $${PREFIX}/include/mythtv/libmythbase
@@ -12,7 +12,7 @@
/// Update this whenever the plug-in API changes.
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
/// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.26.20120504-1"
+#define MYTH_BINARY_VERSION "0.26.20120509-1"
/** \brief Increment this whenever the MythTV network protocol changes.
*

0 comments on commit 6149533

Please sign in to comment.