aboutsummaryrefslogtreecommitdiffstats
path: root/plpftp
diff options
context:
space:
mode:
authorFritz Elfert <felfert@to.com>2003-02-05 07:59:09 +0000
committerFritz Elfert <felfert@to.com>2003-02-05 07:59:09 +0000
commitf0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85 (patch)
tree166bf2df5ca4fc40904af30a56a0de88683baf8d /plpftp
parent27ba222abbf3137eef49e31ac521de01d39c8088 (diff)
downloadplptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.gz
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.bz2
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.zip
- Changes for compiling with gcc 3.2
Diffstat (limited to 'plpftp')
-rw-r--r--plpftp/ftp.cc22
-rw-r--r--plpftp/main.cc13
2 files changed, 20 insertions, 15 deletions
diff --git a/plpftp/ftp.cc b/plpftp/ftp.cc
index d4e153d..17afbbd 100644
--- a/plpftp/ftp.cc
+++ b/plpftp/ftp.cc
@@ -27,26 +27,28 @@
#include "config.h"
#endif
+#include <plpintl.h>
+#include <rfsv.h>
+#include <rpcs.h>
+#include <bufferarray.h>
+#include <bufferstore.h>
+#include <Enum.h>
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <iomanip>
+
#include <sys/types.h>
#include <dirent.h>
-#include <stream.h>
-#include <fstream.h>
-#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
-#include <iomanip.h>
#include <unistd.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <signal.h>
-#include <plpintl.h>
-#include <rfsv.h>
-#include <rpcs.h>
-#include <bufferarray.h>
-#include <bufferstore.h>
-#include <Enum.h>
#include "ftp.h"
#if HAVE_LIBREADLINE
diff --git a/plpftp/main.cc b/plpftp/main.cc
index ad7fe01..24fcead 100644
--- a/plpftp/main.cc
+++ b/plpftp/main.cc
@@ -25,11 +25,6 @@
#include <config.h>
#endif
-#include <stream.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
#include <plpintl.h>
#include <ppsocket.h>
#include <rfsv.h>
@@ -38,6 +33,12 @@
#include <rpcsfactory.h>
#include <bufferstore.h>
+#include <iostream>
+#include <string>
+
+#include <stdlib.h>
+#include <stdio.h>
+
#include "ftp.h"
#ifndef _GNU_SOURCE
@@ -45,6 +46,8 @@
#endif
#include <getopt.h>
+using namespace std;
+
static void
help()
{