From 84af39896a58e6679252879e282fa2eaa84485a0 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 27 Jan 1999 04:45:17 +0000
Subject: [PATCH] Tweak for solaris.

---
 compiler.h     |  9 +++++++++
 config.h.in    |  3 +++
 fg_constants.h | 22 ++++++++++++++++++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/compiler.h b/compiler.h
index 0e03fb0b7..4f7789d5f 100644
--- a/compiler.h
+++ b/compiler.h
@@ -184,6 +184,12 @@
 
 #endif // __BORLANDC__
 
+#if defined ( sun )
+  extern "C" {
+      extern void *memmove(void *, const void *, size_t);
+  }
+#endif
+
 //
 // No user modifiable definitions beyond here.
 //
@@ -264,6 +270,9 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
 #endif // _COMPILER_H
 
 // $Log$
+// Revision 1.6  1999/01/27 04:45:17  curt
+// Tweak for solaris.
+//
 // Revision 1.5  1999/01/19 20:41:25  curt
 // Added support for MacOS (Metrowerks)
 //
diff --git a/config.h.in b/config.h.in
index e0a809ad3..9512e5fbe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -115,6 +115,9 @@
 /* Define if you have the <getopt.h> header file.  */
 #undef HAVE_GETOPT_H
 
+/* Define if you have the <gpc.h> header file.  */
+#undef HAVE_GPC_H
+
 /* Define if you have the <malloc.h> header file.  */
 #undef HAVE_MALLOC_H
 
diff --git a/fg_constants.h b/fg_constants.h
index ba5764050..8dcf18d98 100644
--- a/fg_constants.h
+++ b/fg_constants.h
@@ -32,8 +32,17 @@
 #  include <config.h>
 #endif
 
-#include <math.h>
+#include "Include/compiler.h"
 
+#ifdef FG_MATCH_EXCEPTION_CLASH
+#  define exception C_exception
+#endif
+
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <cmath>
+#else
+#  include <math.h>
+#endif
 
 /* This should be defined via autoconf in configure.in */
 #ifndef VERSION
@@ -63,6 +72,9 @@
 // PI / 4
 #define FG_PI_4     0.78539816339744830961
 
+#ifndef M_E
+#  define M_E     2.7182818284590452354
+#endif
 
 /* ONE_SECOND is pi/180/60/60, or about 100 feet at earths' equator */
 #define ONE_SECOND 4.848136811E-6
@@ -94,7 +106,6 @@
 #define EPS   0.081819221
 #define INVG  0.031080997
 
-
 /* Time Related Parameters */
 
 #define MJD0  2415020.0
@@ -153,9 +164,12 @@
 
 
 /* $Log$
-/* Revision 1.9  1998/08/24 20:02:35  curt
-/* Added ONE_SECOND (in radians)
+/* Revision 1.10  1999/01/27 04:45:19  curt
+/* Tweak for solaris.
 /*
+ * Revision 1.9  1998/08/24 20:02:35  curt
+ * Added ONE_SECOND (in radians)
+ *
  * Revision 1.8  1998/07/12 03:07:13  curt
  * Added #ifdef HAVE_CONFIG_H ...
  *
-- 
2.39.5