From bfeb01ee15bf99a188c59d5c51b2572ab824e55e Mon Sep 17 00:00:00 2001
From: newhall <newhall>
Date: Wed, 20 Dec 1995 20:17:47 +0000
Subject: [PATCH] removed matherr.h

---
 common/h/makenan.h        | 1 +
 common/src/makenan.C      | 1 -
 paradyn/src/pdMain/main.C | 9 ++++++---
 paradynd/src/main.C       | 5 ++++-
 pdutil/h/makenan.h        | 1 +
 pdutil/src/makenan.C      | 1 -
 visi/h/visualization.h    | 9 ++++++---
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/common/h/makenan.h b/common/h/makenan.h
index ccd66a4..29ab655 100644
--- a/common/h/makenan.h
+++ b/common/h/makenan.h
@@ -9,6 +9,7 @@ extern bool nan_created;
 extern bool matherr_flag;
 
 // There is no standard macro to create a NaN valued float
+extern int matherr(struct exception *x);
 extern float make_Nan();
 #define PARADYN_NaN make_Nan()
 
diff --git a/common/src/makenan.C b/common/src/makenan.C
index 7965167..9fcf609 100644
--- a/common/src/makenan.C
+++ b/common/src/makenan.C
@@ -1,5 +1,4 @@
 #include "util/h/makenan.h"
-#include "util/h/matherr.h"
 #include "util/h/headers.h"
 
 float f_paradyn_nan = 0;
diff --git a/paradyn/src/pdMain/main.C b/paradyn/src/pdMain/main.C
index fa60a11..adfb80c 100644
--- a/paradyn/src/pdMain/main.C
+++ b/paradyn/src/pdMain/main.C
@@ -1,7 +1,10 @@
 /* $Log: main.C,v $
-/* Revision 1.35  1995/12/03 21:33:11  newhall
-/* changes to support new sampleDataCallbackFunc
+/* Revision 1.36  1995/12/20 20:18:35  newhall
+/* removed matherr.h
 /*
+ * Revision 1.35  1995/12/03  21:33:11  newhall
+ * changes to support new sampleDataCallbackFunc
+ *
  * Revision 1.34  1995/11/21  15:24:39  naim
  * Exiting if there is an unrecoverable parse error - naim
  *
@@ -150,7 +153,7 @@
 #include "dataManager.thread.SRVR.h"
 #include "VM.thread.SRVR.h"
 #include "../UIthread/tkTools.h" // tclpanic
-#include "util/h/matherr.h"
+#include "util/h/makenan.h"
 #include "paradyn/src/DMthread/BufferPool.h"
 #include "paradyn/src/DMthread/DVbufferpool.h"
 
diff --git a/paradynd/src/main.C b/paradynd/src/main.C
index 824a236..fcda4fe 100644
--- a/paradynd/src/main.C
+++ b/paradynd/src/main.C
@@ -2,6 +2,9 @@
  * Main loop for the default paradynd.
  *
  * $Log: main.C,v $
+ * Revision 1.39  1995/12/20 20:19:00  newhall
+ * removed matherr.h
+ *
  * Revision 1.38  1995/12/15 22:26:50  mjrg
  * Merged paradynd and paradyndPVM
  * Get module name for functions from symbol table in solaris
@@ -160,7 +163,7 @@
  */
 
 #include "util/h/headers.h"
-#include "util/h/matherr.h"
+#include "util/h/makenan.h"
 
 #include "rtinst/h/rtinst.h"
 
diff --git a/pdutil/h/makenan.h b/pdutil/h/makenan.h
index ccd66a4..29ab655 100644
--- a/pdutil/h/makenan.h
+++ b/pdutil/h/makenan.h
@@ -9,6 +9,7 @@ extern bool nan_created;
 extern bool matherr_flag;
 
 // There is no standard macro to create a NaN valued float
+extern int matherr(struct exception *x);
 extern float make_Nan();
 #define PARADYN_NaN make_Nan()
 
diff --git a/pdutil/src/makenan.C b/pdutil/src/makenan.C
index 7965167..9fcf609 100644
--- a/pdutil/src/makenan.C
+++ b/pdutil/src/makenan.C
@@ -1,5 +1,4 @@
 #include "util/h/makenan.h"
-#include "util/h/matherr.h"
 #include "util/h/headers.h"
 
 float f_paradyn_nan = 0;
diff --git a/visi/h/visualization.h b/visi/h/visualization.h
index 62b449f..6e92a76 100644
--- a/visi/h/visualization.h
+++ b/visi/h/visualization.h
@@ -17,9 +17,12 @@
  */
 
 /* $Log: visualization.h,v $
-/* Revision 1.14  1995/12/20 18:35:02  newhall
-/* including matherr.h so that it does not need to be included by visis
+/* Revision 1.15  1995/12/20 20:19:31  newhall
+/* removed matherr.h
 /*
+ * Revision 1.14  1995/12/20 18:35:02  newhall
+ * including matherr.h so that it does not need to be included by visis
+ *
  * Revision 1.13  1995/12/18 17:22:02  naim
  * Adding function showErrorVisiCallback to display error messages from
  * visis - naim
@@ -70,7 +73,7 @@
 
 #include "datagrid.h"
 #include "visiTypes.h"
-#include "util/h/matherr.h"
+#include "util/h/makenan.h"
 
 #define FILETABLESIZE  64
 #define EVENTSIZE      FOLD+1
-- 
1.8.3.1