diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
| commit | b0bdc9e3950e7e1e4cd0b1e6601da7744ecccf08 (patch) | |
| tree | a0ef43a85df03df285cd86aa66c5c4b2477af0cc /editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx | |
| parent | 643_OO did not get tagged for the ${cc} -> ${CC} change. (diff) | |
Add merged patches which conflicted.
Notes
Notes:
svn path=/head/; revision=68622
Diffstat (limited to 'editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx')
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx index 5e02222798cc..77df99f679ab 100644 --- a/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice.org-1.1/files/patch-dtrans+source+X11+X11_selection.cxx @@ -1,10 +1,10 @@ ---- ../dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 -+++ ../dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 -@@ -65,7 +65,7 @@ +--- ../dtrans/source/X11/X11_selection.cxx.orig Wed Jul 31 22:43:56 2002 ++++ ../dtrans/source/X11/X11_selection.cxx Fri Oct 18 20:16:37 2002 +@@ -66,7 +66,7 @@ #include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xutil.h> --#if defined(LINUX) || defined(NETBSD) +-#ifdef LINUX +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) #include <sys/poll.h> #else |