diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-11 19:20:28 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-11 19:20:28 +0000 |
| commit | 40c11279c3ef2d1e8688134702e0baafaf7dfebf (patch) | |
| tree | 7f4951a34217d0b68f0e8a45b5d96cf6e15fa552 /multimedia/ogle | |
| parent | Fix build on -CURRENT. (diff) | |
Add a fix that accounts for recently added <sys/endian.h> in
4.7-RELEASE. It should account for both prior to 4.7R
and -CURRENT versions
Reviewed by: mbr,
Jose Marques <noway@nohow.demon.co.uk>,
Jon Noack <noackjr@compgeek.com>,
Kim Scarborough <sluggo@unknown.nu>
Notes
Notes:
svn path=/head/; revision=67820
Diffstat (limited to 'multimedia/ogle')
| -rw-r--r-- | multimedia/ogle/files/extra-patch-include:ogle_endian.h | 24 | ||||
| -rw-r--r-- | multimedia/ogle/files/patch-include:ogle_endian.h | 11 |
2 files changed, 21 insertions, 14 deletions
diff --git a/multimedia/ogle/files/extra-patch-include:ogle_endian.h b/multimedia/ogle/files/extra-patch-include:ogle_endian.h index c776103ba06f..391a38e4dfa2 100644 --- a/multimedia/ogle/files/extra-patch-include:ogle_endian.h +++ b/multimedia/ogle/files/extra-patch-include:ogle_endian.h @@ -1,25 +1,21 @@ ---- include/ogle_endian.h.orig Thu Oct 4 05:42:11 2001 -+++ include/ogle_endian.h Sat Sep 21 17:47:15 2002 -@@ -38,7 +38,22 @@ - # define FROM_BE_32(x) (bswap32(x)) - #elif defined(HAVE_SYS_ENDIAN_H) +--- include/ogle_endian.h.orig Thu Oct 10 12:20:03 2002 ++++ include/ogle_endian.h Thu Oct 10 12:21:47 2002 +@@ -39,6 +39,18 @@ + #elif defined(HAVE_SYS_ENDIAN_H) && !defined(__FreeBSD__) # include <sys/endian.h> -+#if defined(__FreeBSD__) -+#if __FreeBSD_version >= 500000 -+# define FROM_BE_32(x) (bswap32(x)) -+#else # define FROM_BE_32(x) (swap32(x)) -+#endif -+#else -+# define FROM_BE_32(x) (swap32(x)) -+#endif +#elif defined(__FreeBSD__) ++# if defined(HAVE_SYS_ENDIAN_H) && __FreeBSD_version >= 500000 ++# include <sys/endian.h> ++# define FROM_BE_32(x) (bswap32(x)) ++# else +# define _KERNEL -+# define I486_CPU /* Will crash unless 486+ */ ++# define I486_CPU /* Will crash unless 486+ */ +# include <machine/endian.h> +# undef _KERNEL +# undef I486_CPU +# define FROM_BE_32(x) (ntohl(x)) ++# endif #else # warning "No accelerated byte swap found. Using slow c version." # include <inttypes.h> diff --git a/multimedia/ogle/files/patch-include:ogle_endian.h b/multimedia/ogle/files/patch-include:ogle_endian.h new file mode 100644 index 000000000000..479aadab635d --- /dev/null +++ b/multimedia/ogle/files/patch-include:ogle_endian.h @@ -0,0 +1,11 @@ +--- include/ogle_endian.h.orig Thu Oct 4 00:41:49 2001 ++++ include/ogle_endian.h Thu Oct 10 12:08:36 2002 +@@ -36,7 +36,7 @@ + #elif defined(HAVE_SYS_BSWAP_H) + # include <sys/bswap.h> + # define FROM_BE_32(x) (bswap32(x)) +-#elif defined(HAVE_SYS_ENDIAN_H) ++#elif defined(HAVE_SYS_ENDIAN_H) && !defined(__FreeBSD__) + # include <sys/endian.h> + # define FROM_BE_32(x) (swap32(x)) + #else |