Martin Spott: Use standardized Sun directive.

diff --git a/configure.ac b/configure.ac
index 8fc4a9aa614a4b5ab1aa0c91a1276023f6841ed5..6e021f9ef1919dca97a8b3aabc25eea6f1d42a09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,7 @@ network_LIBS="$LIBS"
 LIBS=""
 
 dnl check for some default libraries
-AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(cos, [fastm m])
 AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 08623551ba53d966b6a492ae40eaa49fa9c179e8..bbc5b9bfa796031f6e405f3226193b910487bb57 100644 (file)
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -36,7 +36,7 @@
 #ifdef _MSC_VER
 #  include <float.h>
 #  define finite _finite
-#elif defined(sun) || defined(sgi)
+#elif defined(__sun) || defined(sgi)
 #  include <ieeefp.h>
 #endif
 

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 043eeb8ee12cad7f6bb17a4f093ac5bc20bedf34..98b4f139493c6343c4ff93f719faaafcbd8cdccc 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -58,7 +58,7 @@
 #include <Main/fg_props.hxx>
 #include <Scenery/scenery.hxx>
 
-#if defined ( __sun__ ) || defined ( __sgi )
+#if defined (__sun) || defined ( __sgi )
 extern "C" {
     extern void *memmove(void *, const void *, size_t);
 }

diff --git a/src/Main/metar_main.cxx b/src/Main/metar_main.cxx
index 0f79ec83cbc6c562d67a1f510e8325555eaac10b..36567ffb30b640fcc9f9636ae46ceaed130546f5 100644 (file)
--- a/src/Main/metar_main.cxx
+++ b/src/Main/metar_main.cxx
@@ -31,7 +31,7 @@
 using namespace std;
 
 // text color
-#if defined(__linux__) || defined( __sun__ ) || defined(__CYGWIN__) \
+#if defined(__linux__) || defined(__sun) || defined(__CYGWIN__) \
     || defined( __FreeBSD__ ) || defined ( sgi )
 #      define R "\033[31;1m"           // red
 #      define G "\033[32;1m"           // green

diff --git a/tests/test-mktime.cxx b/tests/test-mktime.cxx
index 24e328d23e0fe19f44fa484147868acf35359ee3..037e94e5e3d482734515a3d83be5250988bdbd68 100644 (file)
--- a/tests/test-mktime.cxx
+++ b/tests/test-mktime.cxx
@@ -75,7 +75,7 @@ time_t get_start_gmt(int year) {
 #else // ! defined ( MK_TIME_IS_GMT )
 
     // timezone seems to work as a proper offset for Linux & Solaris
-#  if defined( __linux__ ) || defined( __sun__ ) || defined( __CYGWIN__ )
+#  if defined( __linux__ ) || defined(__sun) || defined( __CYGWIN__ )
 #   define TIMEZONE_OFFSET_WORKS 1
 #  endif