diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-01-02 07:02:52 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-01-02 07:02:52 +0800 |
| commit | 5ab9d1d57e5b22ec49aa09e8cd99b3930b1b8934 (patch) | |
| tree | 38c01c3611d49bc3c880cff31a56a6b396e72b33 | |
| parent | 6cf69b661db8993af10d0b7e602c29a4f3e530ed (diff) | |
| download | freebsd-ports-gnome-5ab9d1d57e5b22ec49aa09e8cd99b3930b1b8934.tar.gz freebsd-ports-gnome-5ab9d1d57e5b22ec49aa09e8cd99b3930b1b8934.tar.zst freebsd-ports-gnome-5ab9d1d57e5b22ec49aa09e8cd99b3930b1b8934.zip | |
Fix breakage on 5-CURRENT.
PR: 23777
Submitted by: Donald J. Maddox <dmaddox@sc.rr.com>
| -rw-r--r-- | audio/timidity++/files/patch-ac | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac index 037f3dab7f4e..dfa8da5d9860 100644 --- a/audio/timidity++/files/patch-ac +++ b/audio/timidity++/files/patch-ac @@ -1,11 +1,40 @@ ---- timidity/timidity.h.orig Thu Nov 4 21:14:15 1999 -+++ timidity/timidity.h Wed Nov 24 17:15:31 1999 -@@ -441,7 +441,7 @@ - #ifdef LITTLE_ENDIAN + + This patch-ac should be replaced with this patch: + +--- timidity/timidity.h.orig Fri Dec 22 17:55:40 2000 ++++ timidity/timidity.h Fri Dec 22 17:57:41 2000 +@@ -447,8 +447,14 @@ #define LE_SHORT(x) (x) #define LE_LONG(x) (x) --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && !defined(__alpha__) - #define BE_SHORT(x) __byte_swap_word(x) - #define BE_LONG(x) __byte_swap_long(x) + #ifdef __FreeBSD__ +-#define BE_SHORT(x) __byte_swap_word(x) +-#define BE_LONG(x) __byte_swap_long(x) ++# include <osreldate.h> ++# if __FreeBSD_version <= 500000 ++# define BE_SHORT(x) __byte_swap_word(x) ++# define BE_LONG(x) __byte_swap_long(x) ++# else ++# define BE_SHORT(x) __uint8_swap_uint16(x) ++# define BE_LONG(x) __uint8_swap_uint32(x) ++# endif #else + #define BE_SHORT(x) XCHG_SHORT(x) + #define BE_LONG(x) XCHG_LONG(x) +@@ -457,8 +463,14 @@ + #define BE_SHORT(x) (x) + #define BE_LONG(x) (x) + #ifdef __FreeBSD__ +-#define LE_SHORT(x) __byte_swap_word(x) +-#define LE_LONG(x) __byte_swap_long(x) ++# include <osreldate.h> ++# if __FreeBSD_version <= 500000 ++# define LE_SHORT(x) __byte_swap_word(x) ++# define LE_LONG(x) __byte_swap_long(x) ++# else ++# define LE_SHORT(x) __uint8_swap_uint16(x) ++# define LE_LONG(x) __uint8_swap_uint32(x) ++# endif + #else + #define LE_SHORT(x) XCHG_SHORT(x) + #define LE_LONG(x) XCHG_LONG(x) + |