aboutsummaryrefslogtreecommitdiffstats
path: root/ncpd
diff options
context:
space:
mode:
authorFritz Elfert <felfert@to.com>2001-02-01 02:03:25 +0000
committerFritz Elfert <felfert@to.com>2001-02-01 02:03:25 +0000
commit6c9647c1866b49d61ea3ce7d9201450fa0497b52 (patch)
treed240f512fb1a5d72f5b0fe3ad4b60c937cfd8274 /ncpd
parent320ed6edbbde5936ac07247896fbc2f51505a469 (diff)
downloadplptools-6c9647c1866b49d61ea3ce7d9201450fa0497b52.tar.gz
plptools-6c9647c1866b49d61ea3ce7d9201450fa0497b52.tar.bz2
plptools-6c9647c1866b49d61ea3ce7d9201450fa0497b52.zip
More cleanup:
- Removed bool.h and references to it everywhere. This is checked now in ./configure and the stuff went into acconfig.h - Replaced ugly bufferStore-based method of returning directory entries from rfsv::readdir() by a cleaner way. (A new, separate class PlpDirent is returned now.) With the old implementation, the caller has to know about the layout of the entries. Also, the old implementation was not 64bit aware. - Similar replacement done for rfsv::dir(). This now returns the entries in a standard STL container (deque) instead of a bufferArray. - Started renaming #include statements for standard library headers from the old <xxx.h> form to the new recommended <xxx> form.
Diffstat (limited to 'ncpd')
-rw-r--r--ncpd/channel.cc4
-rw-r--r--ncpd/channel.h5
-rw-r--r--ncpd/link.cc1
-rw-r--r--ncpd/link.h4
-rw-r--r--ncpd/ncp.cc3
-rw-r--r--ncpd/ncp.h4
-rw-r--r--ncpd/packet.cc5
-rw-r--r--ncpd/packet.h5
-rw-r--r--ncpd/socketchan.cc4
-rw-r--r--ncpd/socketchan.h4
10 files changed, 26 insertions, 13 deletions
diff --git a/ncpd/channel.cc b/ncpd/channel.cc
index f52cea1..d708cd9 100644
--- a/ncpd/channel.cc
+++ b/ncpd/channel.cc
@@ -23,9 +23,11 @@
// e-mail philip.proudman@btinternet.com
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stream.h>
-#include "bool.h"
#include "channel.h"
#include "ncp.h"
diff --git a/ncpd/channel.h b/ncpd/channel.h
index 2c06d6d..90f08f6 100644
--- a/ncpd/channel.h
+++ b/ncpd/channel.h
@@ -25,10 +25,11 @@
#ifndef _channel_h_
#define _channel_h_
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
-#include "bool.h"
-
class ncp;
class bufferStore;
diff --git a/ncpd/link.cc b/ncpd/link.cc
index f4f73e4..90a7451 100644
--- a/ncpd/link.cc
+++ b/ncpd/link.cc
@@ -30,7 +30,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include "bool.h"
#include "link.h"
#include "packet.h"
#include "bufferstore.h"
diff --git a/ncpd/link.h b/ncpd/link.h
index 23e2ac5..010100b 100644
--- a/ncpd/link.h
+++ b/ncpd/link.h
@@ -25,7 +25,9 @@
#ifndef _link_h_
#define _link_h_
-#include "bool.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "bufferstore.h"
#include "bufferarray.h"
diff --git a/ncpd/ncp.cc b/ncpd/ncp.cc
index 1fbd533..8af83d8 100644
--- a/ncpd/ncp.cc
+++ b/ncpd/ncp.cc
@@ -23,14 +23,13 @@
// e-mail philip.proudman@btinternet.com
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <stream.h>
#include <string.h>
#include <time.h>
-#include "bool.h"
#include "ncp.h"
#include "linkchan.h"
#include "bufferstore.h"
diff --git a/ncpd/ncp.h b/ncpd/ncp.h
index c71fdc1..3b82ea8 100644
--- a/ncpd/ncp.h
+++ b/ncpd/ncp.h
@@ -25,7 +25,9 @@
#ifndef _ncp_h_
#define _ncp_h_
-#include "bool.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "bufferstore.h"
#include "linkchan.h"
class link;
diff --git a/ncpd/packet.cc b/ncpd/packet.cc
index 5c05849..ebefc0a 100644
--- a/ncpd/packet.cc
+++ b/ncpd/packet.cc
@@ -23,6 +23,10 @@
// e-mail philip.proudman@btinternet.com
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <malloc.h>
#include <unistd.h>
@@ -38,7 +42,6 @@
extern "C" {
#include "mp_serial.h"
}
-#include "bool.h"
#include "bufferstore.h"
#include "packet.h"
#include "iowatch.h"
diff --git a/ncpd/packet.h b/ncpd/packet.h
index 86db078..afab41d 100644
--- a/ncpd/packet.h
+++ b/ncpd/packet.h
@@ -25,10 +25,11 @@
#ifndef _packet_h
#define _packet_h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
-#include "bool.h"
-class psiEmul;
class bufferStore;
class IOWatch;
diff --git a/ncpd/socketchan.cc b/ncpd/socketchan.cc
index a7d612e..1e3fd08 100644
--- a/ncpd/socketchan.cc
+++ b/ncpd/socketchan.cc
@@ -22,12 +22,14 @@
//
// e-mail philip.proudman@btinternet.com
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stream.h>
#include "stdio.h"
#include "string.h"
#include "malloc.h"
-#include "bool.h"
#include "socketchan.h"
#include "ncp.h"
#include "ppsocket.h"
diff --git a/ncpd/socketchan.h b/ncpd/socketchan.h
index 5fe7a13..15645dd 100644
--- a/ncpd/socketchan.h
+++ b/ncpd/socketchan.h
@@ -25,7 +25,9 @@
#ifndef _socketchan_h_
#define _socketchan_h_
-#include "bool.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "channel.h"
class ppsocket;
class IOWatch;