aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2014-01-16 13:55:59 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2014-01-16 13:56:39 +0000
commitf1e18b1a4fffc673f0b08b86b347028ae50bac9a (patch)
tree84726f3a901fdc298f62a04df5f25341cc24f188 /testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
parentc8846a14adb4097b4479e4d5b5ee682eecb676a7 (diff)
downloadaports-f1e18b1a4fffc673f0b08b86b347028ae50bac9a.tar.bz2
aports-f1e18b1a4fffc673f0b08b86b347028ae50bac9a.tar.xz
testing/mkvtoolnix: new aport
Diffstat (limited to 'testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch')
-rw-r--r--testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch b/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
new file mode 100644
index 0000000000..1e385210ce
--- /dev/null
+++ b/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
@@ -0,0 +1,48 @@
+From b115cc238a4433e0b29d97392e4251b689aff311 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Thu, 16 Jan 2014 12:26:50 +0000
+Subject: [PATCH] uclibc already defines bswap
+
+---
+ src/common/bswap.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/common/bswap.h b/src/common/bswap.h
+index f1cf28a..c59a5a2 100644
+--- a/src/common/bswap.h
++++ b/src/common/bswap.h
+@@ -16,11 +16,14 @@
+
+ #include "common/common_pch.h"
+
++#ifndef bswap_16
+ inline uint16_t
+ bswap_16(uint16_t x) {
+ return (x >> 8) | (x << 8);
+ }
++#endif
+
++#ifndef bswap_32
+ inline uint32_t
+ bswap_32(uint32_t x) {
+ x = ((x << 8) & 0xff00ff00) | ((x >> 8) & 0x00ff00ff);
+@@ -28,7 +31,9 @@ bswap_32(uint32_t x) {
+
+ return x;
+ }
++#endif
+
++#ifndef bswap_64
+ inline uint64_t
+ bswap_64(uint64_t x) {
+ union {
+@@ -42,5 +47,6 @@ bswap_64(uint64_t x) {
+
+ return r.ll;
+ }
++#endif
+
+ #endif // MTX_COMMON_BSWAP_H
+--
+1.8.5.2
+