diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-04-02 23:48:28 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-04-02 23:48:28 +0000 |
| commit | a31c45a0b4b17f5d096eed1898c2707ee051cbfc (patch) | |
| tree | 9c56cf569b60a5bc10df486b70071e922ead482f /editors/openoffice-devel/files/patch-unzip+source+file_io.c | |
| parent | Fix 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-devel/files/patch-unzip+source+file_io.c')
| -rw-r--r-- | editors/openoffice-devel/files/patch-unzip+source+file_io.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/editors/openoffice-devel/files/patch-unzip+source+file_io.c b/editors/openoffice-devel/files/patch-unzip+source+file_io.c deleted file mode 100644 index 0430ff41b6a9..000000000000 --- a/editors/openoffice-devel/files/patch-unzip+source+file_io.c +++ /dev/null @@ -1,36 +0,0 @@ ---- ../unzip/source/file_io.c.orig Tue Mar 5 18:32:38 2002 -+++ ../unzip/source/file_io.c Tue Mar 5 18:40:50 2002 -@@ -500,7 +500,7 @@ - #ifdef MPW - pCallBack( 0 ); - #else -- #if defined LINUX || defined MACOSX || defined NETBSD -+ #if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD - pCallBack( lseek(outfd, 0, SEEK_CUR) ); - #else - pCallBack( tell( outfd ) ); -@@ -860,8 +860,11 @@ - /* extern char *_TZ; no longer used? */ - #else /* !AMIGA */ - # define YRBASE 1970 --#ifdef BSD --#ifndef __386BSD__ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif */ FREEBSD */ -+#if defined BSD || defined FREEBSD -+#if !defined __386BSD__ && !defined FREEBSD - static struct timeb tbp; - #endif /* !__386BSD__ */ - #else /* !BSD */ -@@ -932,8 +935,8 @@ - /* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */ - m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss; - --#if defined BSD && ! defined MACOSX && ! defined NETBSD --#ifndef __386BSD__ -+#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD -+#if !defined __386BSD__ && !defined FREEBSD - ftime(&tbp); - m_time += tbp.timezone * 60L; - #endif |