summaryrefslogtreecommitdiff
path: root/archivers/libcabinet/files/patch-cfheader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'archivers/libcabinet/files/patch-cfheader.cpp')
-rw-r--r--archivers/libcabinet/files/patch-cfheader.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/archivers/libcabinet/files/patch-cfheader.cpp b/archivers/libcabinet/files/patch-cfheader.cpp
index 9d06cd72d6d0..4d026b5e760a 100644
--- a/archivers/libcabinet/files/patch-cfheader.cpp
+++ b/archivers/libcabinet/files/patch-cfheader.cpp
@@ -1,6 +1,13 @@
---- cfheader.cpp.orig Tue Aug 19 18:24:35 2003
-+++ cfheader.cpp Tue Aug 19 18:28:27 2003
-@@ -24,11 +24,14 @@
+--- cfheader.cpp.orig 1999-10-24 02:13:29.000000000 -0400
++++ cfheader.cpp 2014-02-21 16:02:37.285291121 -0500
+@@ -18,17 +18,23 @@
+ #define __CFHEADER_CPP__
+
+ #include <string.h>
+-#include <fstream.h>
++#include <fstream>
+ #include "bstring.h"
+ #include "cftypes.h"
#include "cfheader.h"
#ifdef unix
@@ -10,13 +17,16 @@
#include <strstrea.h>
#endif
++using std::ios;
++using std::ifstream;
++using std::ofstream;
+using std::ostrstream;
+using std::ends;
+
////////////////////////////////////////****************************************
// Initializes a valid fixed cabinet header
-@@ -127,7 +130,7 @@
+@@ -127,7 +133,7 @@
{
reserved_area = new byte[cabinet_ra_size];
@@ -25,7 +35,7 @@
{
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
}
-@@ -172,7 +175,7 @@
+@@ -172,7 +178,7 @@
if(cabinet_ra_size > 0) // If has cabinet reserved area
{
@@ -34,7 +44,7 @@
{
return WRITE_ERROR;
}
-@@ -210,4 +213,4 @@
+@@ -210,4 +216,4 @@
////////////////////////////////////////****************************************