diff options
| author | Bruce A. Mah <bmah@FreeBSD.org> | 2002-04-27 02:22:51 +0000 |
|---|---|---|
| committer | Bruce A. Mah <bmah@FreeBSD.org> | 2002-04-27 02:22:51 +0000 |
| commit | 4806d5734aba188d75faf38dc98be7d74f6c23fc (patch) | |
| tree | c43d091a56fba205ac40a73eff364810f38896ac /audio/timidity++ | |
| parent | New port: textproc/jdictionary. (diff) | |
Unbreak for -CURRENT (byte-swapping macros changed names).
Run-tested on 4-STABLE/i386 and 5-CURRENT/i386.
Approved by: Yoichi ASAI <yatt@msc.biglobe.ne.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=58205
Diffstat (limited to 'audio/timidity++')
| -rw-r--r-- | audio/timidity++/files/patch-ac | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac index dfa8da5d9860..fc20afd309d4 100644 --- a/audio/timidity++/files/patch-ac +++ b/audio/timidity++/files/patch-ac @@ -1,9 +1,6 @@ - - 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 @@ +--- timidity/timidity.h.orig Fri Jan 11 23:36:13 2002 ++++ timidity/timidity.h Fri Apr 5 15:37:51 2002 +@@ -450,8 +450,19 @@ #define LE_SHORT(x) (x) #define LE_LONG(x) (x) #ifdef __FreeBSD__ @@ -14,13 +11,18 @@ +# 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) ++# if __FreeBSD_version <= 500028 ++# define BE_SHORT(x) __uint8_swap_uint16(x) ++# define BE_LONG(x) __uint8_swap_uint32(x) ++# else ++# define BE_SHORT(x) __bswap16(x) ++# define BE_LONG(x) __bswap32(x) ++# endif +# endif #else #define BE_SHORT(x) XCHG_SHORT(x) #define BE_LONG(x) XCHG_LONG(x) -@@ -457,8 +463,14 @@ +@@ -460,8 +471,19 @@ #define BE_SHORT(x) (x) #define BE_LONG(x) (x) #ifdef __FreeBSD__ @@ -31,10 +33,14 @@ +# 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) ++# if __FreeBSD_version <= 500028 ++# define LE_SHORT(x) __uint8_swap_uint16(x) ++# define LE_LONG(x) __uint8_swap_uint32(x) ++# else ++# define LE_SHORT(x) __bswap16(x) ++# define LE_LONG(x) __bswap32(x) ++# endif +# endif #else #define LE_SHORT(x) XCHG_SHORT(x) #define LE_LONG(x) XCHG_LONG(x) - |