diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-05 10:16:46 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-05 10:16:46 +0000 |
| commit | 65348be49e26db8754bc832cdcfcde4770d48d31 (patch) | |
| tree | 85fe85e3ad91422313774ba3a0c77d4c3696c83a /archivers | |
| parent | Make port more INFO friendly (diff) | |
Follow up by Simon Barner <barner@in.tum.de>
Thanks for committing my patch. However, the port does not build at the
present (I think we must include <inttypes.h>, but I don't know whether
it is present on -current). This patch (pls. replace old patch file) works
on -stable with both gcc 2.95.4 and 3.3.1.
Submitted by: Simon Barner <barner@in.tum.de>
Notes
Notes:
svn path=/head/; revision=88591
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libcabinet/files/patch-cftypes.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/archivers/libcabinet/files/patch-cftypes.cpp b/archivers/libcabinet/files/patch-cftypes.cpp index c39330eb96fa..3b5bbdb861cd 100644 --- a/archivers/libcabinet/files/patch-cftypes.cpp +++ b/archivers/libcabinet/files/patch-cftypes.cpp @@ -1,10 +1,16 @@ ---- cftypes.cpp.orig Sat Oct 23 23:13:29 1999 -+++ cftypes.cpp Sun Aug 31 06:07:25 2003 -@@ -10,7 +10,15 @@ +--- cftypes.cpp.orig Sun Oct 24 08:13:29 1999 ++++ cftypes.cpp Wed Sep 3 14:24:13 2003 +@@ -10,11 +10,20 @@ #ifndef __CFTYPES_CPP__ #define __CFTYPES_CPP__ -#include <values.h> ++#include <inttypes.h> ++#include <limits.h> + #include <fstream.h> + #include "zlib.h" + #include "cftypes.h" + +#ifndef MAXSHORT +#define BITSPERBYTE 8 +#define BITS(type) (BITSPERBYTE * (int)sizeof(type)) @@ -13,11 +19,10 @@ +#define MAXSHORT ((int16_t)~MINSHORT) +#endif + -+#include <limits.h> - #include <fstream.h> - #include "zlib.h" - #include "cftypes.h" -@@ -138,15 +146,20 @@ + /******************************************************************************/ + + int convert_z_error_code(int code) +@@ -138,15 +147,20 @@ int io_read(istream& in, byte* buf, word len) { @@ -43,7 +48,7 @@ ? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK; } -@@ -154,14 +167,19 @@ +@@ -154,14 +168,19 @@ int io_write(ostream& out, const byte* buf, word len) { |