aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
commit920705cf70d4a230c7d75fbd869e2cef162cf062 (patch)
treef31df6fdf87cf2695463488f79411ef696224136
parent92239dafb601d2ee5da1554d19631267c81fe57c (diff)
downloadnx-libs-920705cf70d4a230c7d75fbd869e2cef162cf062.tar.gz
nx-libs-920705cf70d4a230c7d75fbd869e2cef162cf062.tar.bz2
nx-libs-920705cf70d4a230c7d75fbd869e2cef162cf062.zip
Imported nxcomp-3.2.0-7.tar.gznxcomp/3.2.0-7
Summary: Imported nxcomp-3.2.0-7.tar.gz Keywords: Imported nxcomp-3.2.0-7.tar.gz into Git repository
-rwxr-xr-xnxcomp/BlockCacheSet.cpp2
-rwxr-xr-xnxcomp/CHANGELOG4
-rwxr-xr-xnxcomp/Loop.cpp3
-rwxr-xr-xnxcomp/Message.cpp3
-rwxr-xr-xnxcomp/Misc.cpp1
-rwxr-xr-xnxcomp/Misc.h6
-rwxr-xr-xnxcomp/Proxy.cpp3
-rwxr-xr-xnxcomp/Split.cpp3
8 files changed, 17 insertions, 8 deletions
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp
index f6591d596..23bc1fa73 100755
--- a/nxcomp/BlockCacheSet.cpp
+++ b/nxcomp/BlockCacheSet.cpp
@@ -15,7 +15,7 @@
/* */
/**************************************************************************/
-#include <iostream.h>
+#include "Misc.h"
#include "BlockCacheSet.h"
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index cceeb07c5..6a26f6626 100755
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,9 @@
ChangeLog:
+nxcomp-3.2.0-7
+
+- Solved a compilation problem on GCC 4.3.
+
nxcomp-3.2.0-6
- Changes considering that unsetenv() returns void on Mac OS X.
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 9992a77e2..62e868bbf 100755
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -29,7 +29,6 @@
#include <dirent.h>
#include <pwd.h>
-#include <fstream.h>
#include <fcntl.h>
#include <sys/types.h>
@@ -42,6 +41,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
+#include "Misc.h"
+
#ifdef __sun
#include <strings.h>
#endif
diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp
index 1bf074e19..2d8e78486 100755
--- a/nxcomp/Message.cpp
+++ b/nxcomp/Message.cpp
@@ -16,12 +16,13 @@
/**************************************************************************/
#include <stdio.h>
-#include <fstream.h>
#include <unistd.h>
#include <string.h>
#include <algorithm>
+#include "Misc.h"
+
//
// We need channel's cache data.
//
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 2f58bdfda..775f53ac4 100755
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -15,7 +15,6 @@
/* */
/**************************************************************************/
-#include <iostream.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h
index f26c56fe3..23058b7b3 100755
--- a/nxcomp/Misc.h
+++ b/nxcomp/Misc.h
@@ -18,12 +18,14 @@
#ifndef Misc_H
#define Misc_H
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <errno.h>
#include <string.h>
+using namespace std;
+
//
// This is MD5 length.
//
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 54a5af406..796568375 100755
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -18,10 +18,11 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
-#include <fstream.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "Misc.h"
+
#if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
#include <netinet/in_systm.h>
#endif
diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp
index 38cfb4bcf..7a3fe2c0f 100755
--- a/nxcomp/Split.cpp
+++ b/nxcomp/Split.cpp
@@ -15,13 +15,14 @@
/* */
/**************************************************************************/
-#include <fstream.h>
#include <unistd.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <utime.h>
+#include "Misc.h"
+
#include "Split.h"
#include "Control.h"