From b6e35c977928bc4fb15b5346128db9823412e6b4 Mon Sep 17 00:00:00 2001
From: Fritz Elfert <felfert@to.com>
Date: Wed, 2 Aug 2000 03:39:20 +0000
Subject: Get rid of second configuration header defs.h[.in]. Configuration now
 is in config.h and this is included as the very first header.

---
 lib/ppsocket.cc    | 4 +++-
 lib/rfsv.h         | 2 +-
 lib/rfsv16.cc      | 5 ++++-
 lib/rfsv32.cc      | 5 ++++-
 lib/rfsvfactory.cc | 5 ++++-
 lib/rpcs.cc        | 5 ++++-
 lib/rpcs16.cc      | 5 ++++-
 lib/rpcs32.cc      | 5 ++++-
 lib/rpcsfactory.cc | 5 ++++-
 9 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/ppsocket.cc b/lib/ppsocket.cc
index 1249f18..060074a 100644
--- a/lib/ppsocket.cc
+++ b/lib/ppsocket.cc
@@ -19,6 +19,9 @@
 //
 //  e-mail philip.proudman@btinternet.com
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +35,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "bufferstore.h"
 #include "ppsocket.h"
diff --git a/lib/rfsv.h b/lib/rfsv.h
index 888db8a..a74fd0c 100644
--- a/lib/rfsv.h
+++ b/lib/rfsv.h
@@ -5,7 +5,7 @@ class ppsocket;
 class bufferStore;
 class bufferArray;
 
-const unsigned long RFSV_SENDLEN = 2000;
+const long RFSV_SENDLEN = 2000;
 
 /**
  * Defines the callback procedure for
diff --git a/lib/rfsv16.cc b/lib/rfsv16.cc
index f71be9f..de57bdf 100644
--- a/lib/rfsv16.cc
+++ b/lib/rfsv16.cc
@@ -23,6 +23,10 @@
 //
 //  e-mail philip.proudman@btinternet.com
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -30,7 +34,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rfsv16.h"
 #include "bufferstore.h"
diff --git a/lib/rfsv32.cc b/lib/rfsv32.cc
index 3980eb9..fa4852f 100644
--- a/lib/rfsv32.cc
+++ b/lib/rfsv32.cc
@@ -19,6 +19,10 @@
 //
 //  e-mail philip.proudman@btinternet.com
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -26,7 +30,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rfsv32.h"
 #include "bufferstore.h"
diff --git a/lib/rfsvfactory.cc b/lib/rfsvfactory.cc
index 2e2067e..a0d8480 100644
--- a/lib/rfsvfactory.cc
+++ b/lib/rfsvfactory.cc
@@ -18,6 +18,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -25,7 +29,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rfsv.h"
 #include "rfsv16.h"
diff --git a/lib/rpcs.cc b/lib/rpcs.cc
index 79630cf..cdbbabd 100644
--- a/lib/rpcs.cc
+++ b/lib/rpcs.cc
@@ -14,6 +14,10 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -21,7 +25,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rpcs.h"
 #include "bufferstore.h"
diff --git a/lib/rpcs16.cc b/lib/rpcs16.cc
index a3af320..d8d75cf 100644
--- a/lib/rpcs16.cc
+++ b/lib/rpcs16.cc
@@ -14,6 +14,10 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -21,7 +25,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rpcs16.h"
 #include "bufferstore.h"
diff --git a/lib/rpcs32.cc b/lib/rpcs32.cc
index 74d5ca4..22433ee 100644
--- a/lib/rpcs32.cc
+++ b/lib/rpcs32.cc
@@ -14,6 +14,10 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,7 +26,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rpcs32.h"
 #include "bufferstore.h"
diff --git a/lib/rpcsfactory.cc b/lib/rpcsfactory.cc
index 4fe0bff..520335e 100644
--- a/lib/rpcsfactory.cc
+++ b/lib/rpcsfactory.cc
@@ -19,6 +19,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stream.h>
 #include <stdlib.h>
 #include <fstream.h>
@@ -26,7 +30,6 @@
 #include <time.h>
 #include <string.h>
 
-#include "defs.h"
 #include "bool.h"
 #include "rpcs16.h"
 #include "rpcs32.h"
-- 
cgit v1.2.3