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-2.0-devel/files/patch-unzip+source+misc.c | |
| 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 '')
| -rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c index 649a976f4c4d..3da53f865c0b 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c @@ -1,15 +1,11 @@ ---- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 -+++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 -@@ -300,9 +300,9 @@ +--- ../unzip/source/misc.c.orig Wed May 2 03:13:26 2001 ++++ ../unzip/source/misc.c Fri Oct 18 23:37:13 2002 +@@ -300,7 +300,7 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) --#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) --#if !defined __386BSD__ && !defined FREEBSD -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) -+#if (defined(BSD) || defined(MTS) -+#if !defined __386BSD__ +-#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__)) ++#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(FREEBSD)) + #if (defined(BSD) || defined(MTS)) + #ifndef __386BSD__ static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ |