aboutsummaryrefslogtreecommitdiffstats
path: root/plpnfsd
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 /plpnfsd
parent27ba222abbf3137eef49e31ac521de01d39c8088 (diff)
downloadplptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.gz
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.tar.bz2
plptools-f0c047e1f40ee2214fe1f73dc3bdc6b0f6de5d85.zip
- Changes for compiling with gcc 3.2
Diffstat (limited to 'plpnfsd')
-rw-r--r--plpnfsd/main.cc24
-rw-r--r--plpnfsd/rfsv_api.h8
2 files changed, 21 insertions, 11 deletions
diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc
index c622bd3..6850cd9 100644
--- a/plpnfsd/main.cc
+++ b/plpnfsd/main.cc
@@ -24,29 +24,31 @@
#include <config.h>
#endif
-#include <stream.h>
-#include <string.h>
+#include <rfsv.h>
+#include <rpcs.h>
+#include <rfsvfactory.h>
+#include <rpcsfactory.h>
+#include <bufferstore.h>
+#include <bufferarray.h>
+#include <ppsocket.h>
+
+#include <iostream>
+#include <string>
+
#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
#include <syslog.h>
-#include "rfsv.h"
-#include "rpcs.h"
-#include "rfsvfactory.h"
-#include "rpcsfactory.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
-#include "ppsocket.h"
-extern "C" {
#include "rfsv_api.h"
-}
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <getopt.h>
+using namespace std;
+
static rfsv *a;
static rfsvfactory *rf;
static char *a_filename = 0;
diff --git a/plpnfsd/rfsv_api.h b/plpnfsd/rfsv_api.h
index d93b9d1..934c5fe 100644
--- a/plpnfsd/rfsv_api.h
+++ b/plpnfsd/rfsv_api.h
@@ -23,6 +23,10 @@
#ifndef _rfsv_api_h_
#define _rfsv_api_h_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "mp.h"
#include "builtins.h"
@@ -64,6 +68,10 @@ extern long rpcs_ps();
#define PSI_A_STREAM 0x0800
#define PSI_A_TEXT 0x1000
+#ifdef __cplusplus
+}
+#endif
+
#endif
/*