diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-05-08 18:08:11 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-05-08 18:08:11 +0000 |
| commit | 6a9d02491ac0b2f68f46547dcfa4a47690d156ee (patch) | |
| tree | 80557ae4dd076eb19b64e6b04737cc0e84530e2a /editors/openoffice.org-3-RC | |
| parent | - Support for PHP3_PORT and PHP4_PORT (diff) | |
Fix breakage and remove redundant _LITTLE_ENDIAN defines. Remove
unneeded include defines.
Notes
Notes:
svn path=/head/; revision=80462
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-sal+inc+osl+endian.h | 16 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h | 18 |
2 files changed, 26 insertions, 8 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+inc+osl+endian.h b/editors/openoffice.org-3-RC/files/patch-sal+inc+osl+endian.h new file mode 100644 index 000000000000..22146c369344 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sal+inc+osl+endian.h @@ -0,0 +1,16 @@ +--- ../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 @@ + + #ifdef FREEBSD + # 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 + #endif + + #ifdef SCO diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h index 806e8f6c35cb..38de4aa359f0 100644 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice.org-3-RC/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,8 +203,16 @@ +@@ -203,25 +203,25 @@ # include <dlfcn.h> # include <sys/filio.h> # include <sys/ioctl.h> @@ -12,15 +12,17 @@ +# include <vm/vm_param.h> +# include <vm/pmap.h> +# include <vm/swap_pager.h> -+# include <machine/vmparam.h> -+# include <machine/pmap.h> # include <sys/un.h> # include <netinet/tcp.h> # define IORESOURCE_TRANSFER_BSD -@@ -216,12 +224,13 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif + # 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 -# define sched_yield() pthread_yield() -# define pthread_testcancel() # define NO_PTHREAD_RTL @@ -36,7 +38,7 @@ #endif #ifdef SCO -@@ -569,12 +578,14 @@ +@@ -547,12 +547,14 @@ #endif #ifdef NO_PTHREAD_RTL |