cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix breakage and remove redundant _LITTLE_ENDIAN defines for CURRENT only. Remove

Browse Source 
unneeded include defines.
This commit is contained in:
Martin Blapp 2003-05-08 18:41:13 +00:00
parent 92b67a7bb4
commit cdf1ea0fbd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=80465
40 changed files with 549 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h Normal file
View File

@ -0,0 +1,20 @@
--- ../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 __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

16
editors/openoffice-1.0/files/patch-sal+osl+unx+system.h
View File

@ -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 @@
--- ../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>
@ -12,17 +12,21 @@
+# 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 @@
# include <machine/endian.h>
+#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

24
editors/openoffice-1.1-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice-1.1/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-1.1/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice-2.0-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-2.0-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice-3-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-3-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice-3/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-3/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

20
editors/openoffice.org-1.0/files/patch-sal+inc+osl+endian.h Normal file
View File

@ -0,0 +1,20 @@
--- ../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 __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

16
editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
View File

@ -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 @@
--- ../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>
@ -12,17 +12,21 @@
+# 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 @@
# include <machine/endian.h>
+#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

24
editors/openoffice.org-1.1-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-1.1/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-1.1/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-2-RC/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-2-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-2-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-2.0-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-2.0/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-2.0/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-2/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-2/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-3-RC/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-3-RC/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-3-devel/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-3/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-3/files/patch-sal+osl+unx+system.h
View File

@ -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

24
editors/openoffice.org-vcltesttool/files/patch-sal+inc+osl+endian.h
View File

@ -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

24
editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+system.h
View File

@ -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

20
editors/openoffice/files/patch-sal+inc+osl+endian.h Normal file
View File

@ -0,0 +1,20 @@
--- ../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 __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

16
editors/openoffice/files/patch-sal+osl+unx+system.h
View File

@ -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 @@
--- ../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>
@ -12,17 +12,21 @@
+# 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 @@
# include <machine/endian.h>
+#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