diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-05-08 18:41:13 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-05-08 18:41:13 +0000 |
| commit | cdf1ea0fbd64f996f418526580b8b98a683a3ed6 (patch) | |
| tree | cb55f495ea2da5d4e8a58d3fc9668cb177205a09 /editors/openoffice.org-1.1-devel | |
| parent | 92b67a7bb4b3695558fb80e62f91d9a5f971ed4d (diff) | |
| download | ports-cdf1ea0fbd64f996f418526580b8b98a683a3ed6.tar.gz ports-cdf1ea0fbd64f996f418526580b8b98a683a3ed6.zip | |
Fix breakage and remove redundant _LITTLE_ENDIAN defines for CURRENT only. Remove
unneeded include defines.
Notes
Notes:
svn path=/head/; revision=80465
Diffstat (limited to 'editors/openoffice.org-1.1-devel')
| -rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h | 24 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h | 24 |
2 files changed, 27 insertions, 21 deletions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h b/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h index 22146c369344..95e5d1861a70 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h +++ b/editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h @@ -1,16 +1,20 @@ ---- ../sal/inc/osl/endian.h.orig Thu May 8 19:38:17 2003 -+++ ../sal/inc/osl/endian.h Thu May 8 19:40:11 2003 -@@ -108,13 +108,6 @@ +--- ../sal/inc/osl/endian.h.orig Thu May 8 20:19:09 2003 ++++ ../sal/inc/osl/endian.h Thu May 8 20:29:00 2003 +@@ -107,7 +107,9 @@ + #endif #ifdef FREEBSD ++# include <sys/param.h> # include <machine/endian.h> --# if BYTE_ORDER == LITTLE_ENDIAN --# define _LITTLE_ENDIAN --# elif BYTE_ORDER == BIG_ENDIAN --# define _BIG_ENDIAN --# elif BYTE_ORDER == PDP_ENDIAN --# define _PDP_ENDIAN --# endif ++#if __FreeBSD_version < 500000 + # if BYTE_ORDER == LITTLE_ENDIAN + # define _LITTLE_ENDIAN + # elif BYTE_ORDER == BIG_ENDIAN +@@ -115,6 +117,7 @@ + # elif BYTE_ORDER == PDP_ENDIAN + # define _PDP_ENDIAN + # endif ++#endif #endif #ifdef SCO diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h index 38de4aa359f0..642977f77a4d 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h @@ -1,6 +1,6 @@ ---- ../sal/osl/unx/system.h.orig Tue Aug 20 08:54:55 2002 -+++ ../sal/osl/unx/system.h Sat Apr 19 22:09:15 2003 -@@ -203,25 +203,25 @@ +--- ../sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 ++++ ../sal/osl/unx/system.h Thu May 8 20:31:08 2003 +@@ -203,12 +203,19 @@ # include <dlfcn.h> # include <sys/filio.h> # include <sys/ioctl.h> @@ -16,15 +16,17 @@ # include <netinet/tcp.h> # define IORESOURCE_TRANSFER_BSD # include <machine/endian.h> --# if BYTE_ORDER == LITTLE_ENDIAN --# define _LITTLE_ENDIAN --# elif BYTE_ORDER == BIG_ENDIAN --# define _BIG_ENDIAN --# elif BYTE_ORDER == PDP_ENDIAN --# define _PDP_ENDIAN --# endif ++#ifdef __FreeBSD_version < 500000 + # if BYTE_ORDER == LITTLE_ENDIAN + # define _LITTLE_ENDIAN + # elif BYTE_ORDER == BIG_ENDIAN +@@ -216,12 +223,14 @@ + # elif BYTE_ORDER == PDP_ENDIAN + # define _PDP_ENDIAN + # endif -# define sched_yield() pthread_yield() -# define pthread_testcancel() ++#endif # define NO_PTHREAD_RTL -# define NO_PTHREAD_PRIORITY -# define CMD_ARG_PRG __progname @@ -38,7 +40,7 @@ #endif #ifdef SCO -@@ -547,12 +547,14 @@ +@@ -569,12 +578,14 @@ #endif #ifdef NO_PTHREAD_RTL |