summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-04-02 23:48:28 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-04-02 23:48:28 +0000
commita31c45a0b4b17f5d096eed1898c2707ee051cbfc (patch)
tree9c56cf569b60a5bc10df486b70071e922ead482f /editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c
parentFix cups support. (diff)
Upgrade to build 641d. More work is necessary to make the build compile.
There are still at least two different gcc bugs in our compiler, one issue has already been found by Alexander Kabaev <ak03@gte.com>. He's working on fixing the other.
Notes
Notes: svn path=/head/; revision=57248
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c')
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c15
1 files changed, 2 insertions, 13 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 38cc972f0bce..26400cd2c1c4 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,5 +1,5 @@
---- ../unzip/source/misc.c.orig Tue Mar 5 18:52:16 2002
-+++ ../unzip/source/misc.c Tue Mar 5 18:53:03 2002
+--- ../unzip/source/misc.c.orig Fri Feb 15 15:10:30 2002
++++ ../unzip/source/misc.c Wed Apr 3 01:19:16 2002
@@ -301,8 +301,8 @@
int yr, mo, dy, hh, mm, ss, leap;
long m_time, days=0;
@@ -11,14 +11,3 @@
static struct timeb tbp;
#endif /* __386BSD__ */
#else /* !(BSD || MTS) */
-@@ -340,8 +340,8 @@
- /* - 1; MS-DOS times always rounded up to nearest even second */
-
- #if (!defined(MACOS) && !defined(__GO32__))
--#if (defined(BSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
--#ifndef __386BSD__
-+#if (defined(BSD) || defined(FREEBSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
-+#if !defined __386BSD__ && !defined FREEBSD
- ftime(&tbp);
- m_time += tbp.timezone * 60L;
- #endif