Revive this patch. They got it completly wrong a second time :P If you

read the code without compile, you'd think that it is correct. But they
didn't compile it.
This commit is contained in:
Martin Blapp 2002-10-19 10:39:26 +00:00
parent edfe461d30
commit dc15a201f9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68332
17 changed files with 357 additions and 0 deletions

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */

View File

@ -0,0 +1,21 @@
--- ../unzip/source/file_io.c.orig Sat Oct 19 11:58:45 2002
+++ ../unzip/source/file_io.c Sat Oct 19 12:03:40 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 ) );
@@ -865,7 +865,9 @@
static struct timeb tbp;
#endif /* !__386BSD__ */
#else /* !BSD */
+#if (!defined(NETBSD) && !defined(FREEBSD))
extern long timezone;
+#endif /* !defined(NETBSD) && !defined(FREEBSD) */
#endif /* ?BSD */
#endif /* ?AMIGA */