summaryrefslogtreecommitdiff
path: root/editors/openoffice/files/patch-sal+osl+unx+system.h
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice/files/patch-sal+osl+unx+system.h')
-rw-r--r--editors/openoffice/files/patch-sal+osl+unx+system.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/editors/openoffice/files/patch-sal+osl+unx+system.h b/editors/openoffice/files/patch-sal+osl+unx+system.h
index 806e8f6c35cb..642977f77a4d 100644
--- a/editors/openoffice/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice/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 @@
+--- ../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