Fix various compiler warnings contributed by Norman Princeton.

diff --git a/Doxyfile b/Doxyfile
index 74fa7e5f39b4ff5d38aaeec5d89c416281699755..ec122dd94039955bcf0ac5cf951af1dd4e8c58ea 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -313,8 +313,8 @@ INPUT                  = \
        simgear/sg_inlines.h \
        simgear/sg_traits.hxx \
        simgear/sg_zlib.h \
-       simgear/threads \
        simgear/sky \
+       simgear/threads \
        simgear/timing \
        simgear/xml
 

diff --git a/SimGear.dsp b/SimGear.dsp
index 612af6462e8b207c2497978945783482f928d386..8726477221d671f773dafdaa8c14a70c918c4ff9 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -243,21 +243,6 @@ SOURCE=.\simgear\ephemeris\neptune.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\ephemeris\pluto.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgephem"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgephem"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\ephemeris\saturn.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -431,21 +416,6 @@ SOURCE=.\simgear\io\sg_socket.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\magvar\coremag.hxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmagvar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmagvar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\magvar\coremag.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -664,36 +634,6 @@ SOURCE=.\simgear\metar\Fracpart.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\metar\Local.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\metar\Metar.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgmetar"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgmetar"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\metar\MetarReport.cpp\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -931,21 +871,6 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\GLBitmaps.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\screen\screen-dump.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -958,21 +883,6 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\screen\win32-printer.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgserial"\r
@@ -1225,21 +1135,6 @@ SOURCE=.\simgear\xgl\xglUtils.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\asciitab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\easyxml.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1255,21 +1150,6 @@ SOURCE=.\simgear\xml\easyxml.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\hashtable.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\hashtable.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1285,96 +1165,6 @@ SOURCE=.\simgear\xml\hashtable.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\iasciitab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\latin1tab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\nametab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\utf8tab.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmldef.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmlparse.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmlparse.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1390,21 +1180,6 @@ SOURCE=.\simgear\xml\xmlparse.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\xmlrole.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmlrole.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1420,21 +1195,6 @@ SOURCE=.\simgear\xml\xmlrole.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\xml\xmltok.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\xml\xmltok.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1447,21 +1207,6 @@ SOURCE=.\simgear\xml\xmltok.c
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\xml\xmltok_impl.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgxml"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgxml"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_z"\r
@@ -1529,21 +1274,6 @@ SOURCE=.\simgear\zlib\deflate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\deflate.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\gzio.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1574,21 +1304,6 @@ SOURCE=.\simgear\zlib\infblock.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infblock.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\infcodes.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1604,21 +1319,6 @@ SOURCE=.\simgear\zlib\infcodes.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infcodes.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\inffast.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1634,36 +1334,6 @@ SOURCE=.\simgear\zlib\inffast.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\inffast.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inffixed.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\inflate.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1694,21 +1364,6 @@ SOURCE=.\simgear\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\inftrees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\infutil.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1724,21 +1379,6 @@ SOURCE=.\simgear\zlib\infutil.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\infutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\trees.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1754,21 +1394,6 @@ SOURCE=.\simgear\zlib\trees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\trees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\simgear\zlib\uncompr.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1796,21 +1421,6 @@ SOURCE=.\simgear\zlib\zutil.c
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\zutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/acconfig.h b/acconfig.h
index e2caadfc0dd1fe9b794a974aa28f442c08015e4c..0578127797555bc8778700dd9c04fb702455d062 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -141,6 +141,9 @@
 /* Define if your struct stat has st_rdev.  */
 #undef HAVE_ST_RDEV
 
+/* Define if you have the stdint.h include.  */
+#undef HAVE_STDINT_H
+
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
 

diff --git a/configure.in b/configure.in
index 4f9553101e8d7c930dcbfaee1287588f5a8f0c3c..bf4b516cf77ee9bb40d810044a67282b9f552519 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -267,8 +267,12 @@ AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" )
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
-       fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \
-        sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+       fcntl.h getopt.h malloc.h memory.h stdint.h stdlib.h sys/param.h \
+       sys/stat.h sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+
+if test "x$ac_cv_header_stdint_h" = "xyes"; then
+    AC_DEFINE( HAVE_STDINT_H )
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/simgear/config.h.in b/simgear/config.h.in
index 5dee430e723ca9f23e299a521d024e3359c4ecd4..4d73832d9e0b541a034a08e1f2bdabb75407c0d8 100644 (file)
--- a/simgear/config.h.in
+++ b/simgear/config.h.in
@@ -44,6 +44,9 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 #undef HAVE_DOPRNT
 
+/* Define if you have the stdint.h include.  */
+#undef HAVE_STDINT_H
+
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
@@ -128,6 +131,9 @@
 /* Define if you have the <memory.h> header file.  */
 #undef HAVE_MEMORY_H
 
+/* Define if you have the <stdint.h> header file.  */
+#undef HAVE_STDINT_H
+
 /* Define if you have the <stdlib.h> header file.  */
 #undef HAVE_STDLIB_H
 

diff --git a/simgear/magvar/coremag.cxx b/simgear/magvar/coremag.cxx
index b29634a2882b08c11a658e150a8f0d5bf0fa7072..cccf753a33bfd2f35774357e2a9cd88776f104e8 100644 (file)
--- a/simgear/magvar/coremag.cxx
+++ b/simgear/magvar/coremag.cxx
@@ -70,12 +70,11 @@
 #include <math.h>
 
 #include <simgear/constants.h>
+#include <simgear/sg_inlines.h>
 
 #include "coremag.hxx"
 
 
-#define        max(a,b)        (((a) > (b)) ? (a) : (b))
-
 static const double pi = 3.14159265358979;
 static const double a = 6378.16;       /* major radius (km) IAU66 ellipsoid */
 static const double f = 1.0 / 298.25;  /* inverse flattening IAU66 ellipsoid */
@@ -243,7 +242,7 @@ double calc_magvar( double lat, double lon, double h, long dat, double* field )
 
        for ( m = 0; m <= nmax; m++ ) {
            double mm = m*m;
-           for ( n = max(m + 1, 2); n <= nmax; n++ ) {
+           for ( n = SG_MAX2(m + 1, 2); n <= nmax; n++ ) {
                roots[m][n][0] = sqrt((n-1)*(n-1) - mm);
                roots[m][n][1] = 1.0 / sqrt( n*n - mm);
            }
@@ -261,7 +260,7 @@ double calc_magvar( double lat, double lon, double h, long dat, double* field )
     /* lower triangle */
     for ( m = 0; m <= nmax; m++ ) {
        // double mm = m*m;
-       for ( n = max(m + 1, 2); n <= nmax; n++ ) {
+       for ( n = SG_MAX2(m + 1, 2); n <= nmax; n++ ) {
            // double root1 = sqrt((n-1)*(n-1) - mm);
            // double root2 = 1.0 / sqrt( n*n - mm);
            P[n][m] = (P[n-1][m] * c * (2.0*n-1) -
@@ -387,7 +386,7 @@ double SGMagVarOrig( double lat, double lon, double h, long dat, double* field )
 
     /* lower triangle */
     for ( m = 0; m <= nmax; m++ ) {
-       for ( n = max(m + 1, 2); n <= nmax; n++ ) {
+       for ( n = SG_MAX2(m + 1, 2); n <= nmax; n++ ) {
            P[n][m] = (P[n-1][m] * c * (2.0*n-1) - P[n-2][m] *
                       sqrt(1.0*(n-1)*(n-1) - m * m)) /
                sqrt(1.0* n * n - m * m);

diff --git a/simgear/metar/Antoi.cpp b/simgear/metar/Antoi.cpp
index 8b471ae566acfba344d170b2e5b813028ef624da..fabb31c2c8fd98aaee67b38f65f1d4d35c6417d5 100644 (file)
--- a/simgear/metar/Antoi.cpp
+++ b/simgear/metar/Antoi.cpp
@@ -29,14 +29,26 @@
 /*           in the conversion.                                     */
 /*                                                                  */
 /*  Output:- An integer corresponding to the value in the character */
-/*           array or MAXNEG (-2147483648) if the function is       */
+/*           array or INT32_MIN (-2147483647-1) if the function is  */
 /*           unable to acquire system storage.                      */
 /*                                                                  */
 /*  Modification History:                                           */
 /*                 None                                             */
 /*                                                                  */
 /********************************************************************/
- 
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#endif
+
+#ifndef INT32_MIN
+#  define INT32_MIN (-2147483647-1)
+#endif
+
 int antoi(char * string, int len)
 {
  
@@ -55,7 +67,7 @@ int antoi(char * string, int len)
  
     tmpstr = (char *)malloc((len+1) * sizeof(char));
  
-    if (tmpstr == NULL) return (-2147483648);
+    if (tmpstr == NULL) return INT32_MIN;
  
     for (i = 0; i < len; i++)
        tmpstr[i] = string[i];

diff --git a/simgear/metar/Local.h b/simgear/metar/Local.h
index 47bec5de112fabcdd0d2fa724fbbabd69ee4f3e6..d0e26faeb3a3dbdca20716d373885b00ac0bf450 100644 (file)
--- a/simgear/metar/Local.h
+++ b/simgear/metar/Local.h
@@ -65,13 +65,17 @@
 #define IMOD(i, j)   (((i) % (j)) < 0 ? ((i) % (j))+(j) : ((i) % (j)))
 #define IN_RANGE(n, lo, hi) ((lo) <= (n) && (n) <= (hi))
 #define LOOPDN(r, n) for ((r) = (n)+1; --(r) > 0;)
-#define MAX(x, y)    (((x) < (y)) ? (y) : (x))
+#ifndef MAX
+#  define MAX(x, y)    (((x) < (y)) ? (y) : (x))
+#endif
 #ifndef max
-#define max(x, y)    (((x) < (y)) ? (y) : (x))
+#  define max(x, y)    (((x) < (y)) ? (y) : (x))
+#endif
+#ifndef MIN
+#  define MIN(x, y)    (((x) < (y)) ? (x) : (y))
 #endif
-#define MIN(x, y)    (((x) < (y)) ? (x) : (y))
 #ifndef min
-#define min(x, y)    (((x) < (y)) ? (x) : (y))
+#  define min(x, y)    (((x) < (y)) ? (x) : (y))
 #endif
 #define STREQ(s, t)  (strcmp(s, t) == 0)
 #define STRGT(s, t)  (strcmp(s, t) > 0)

diff --git a/simgear/metar/MetarReport.cpp b/simgear/metar/MetarReport.cpp
index a1227e88b4ab02fd50a7044bd1f8f042da15bbd6..2987feea098acd176f00501515e17cef6e73c3d7 100644 (file)
--- a/simgear/metar/MetarReport.cpp
+++ b/simgear/metar/MetarReport.cpp
@@ -40,7 +40,7 @@ static int DecodeDirChars( char* c )
                        if ( c[1] == 'E' ) r = 45;
                        else if ( c[1] == 'W' ) r = 315;
                }
-               else if ( r = 180 )
+               else if ( r == 180 )
                {
                        if ( c[1] == 'E' ) r = 135;
                        else if ( c[1] == 'W' ) r = 225;
@@ -216,17 +216,22 @@ int CMetarReport::VerticalVisibility() // Meters
 
 int CMetarReport::Ceiling()
 {
-       return SG_FEET_TO_METER * ((Decoded_METAR *)m_DecodedReport)->Ceiling;
+       return
+           (int)(SG_FEET_TO_METER*((Decoded_METAR *)m_DecodedReport)->Ceiling);
 }
 
 int CMetarReport::EstimatedCeiling()
 {
-       return SG_FEET_TO_METER * ((Decoded_METAR *)m_DecodedReport)->Estimated_Ceiling;
+       return
+           (int)(SG_FEET_TO_METER
+                 * ((Decoded_METAR *)m_DecodedReport)->Estimated_Ceiling);
 }
 
 int CMetarReport::VariableSkyLayerHeight()
 {
-       return SG_FEET_TO_METER * ((Decoded_METAR *)m_DecodedReport)->VrbSkyLayerHgt;
+       return
+           (int)(SG_FEET_TO_METER
+                 * ((Decoded_METAR *)m_DecodedReport)->VrbSkyLayerHgt);
 }
 
 int CMetarReport::SnowDepthInches()
@@ -277,9 +282,9 @@ operator << ( ostream& out, CMetarReport& p )
 }
 
 
-double CMetarReport::AirPressure() 
+double CMetarReport::AirPressure()
 {
-  return ((Decoded_METAR *)m_DecodedReport)->inches_altstng;
+    return ((Decoded_METAR *)m_DecodedReport)->inches_altstng;
 }
 
 void CMetarReport::dump()
@@ -287,12 +292,13 @@ void CMetarReport::dump()
        prtDMETR( (Decoded_METAR *)m_DecodedReport );
 }
 
-double CMetarReport::PrevailVisibility() {
+double CMetarReport::PrevailVisibility()
+{
   //Values from each visibility field converted to meters.
   double smiles;
   double km;
   double meters;
-  smiles = ((Decoded_METAR*) m_DecodedReport)->prevail_vsbySM  * 621 ;
+  smiles = ((Decoded_METAR*) m_DecodedReport)->prevail_vsbySM * 1609.34;
   km =  ((Decoded_METAR*) m_DecodedReport)->prevail_vsbyKM * 1000;
   meters =  ((Decoded_METAR*) m_DecodedReport)->prevail_vsbyM;
   

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index b13a3aa8a3a0c5cf7e4fc4aaff1b1e51f48d856b..9000ae5ce9e347cece8cff1624a65e017c93c3ba 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -81,7 +81,7 @@ CMetarStation::CMetarStation(
        double ulongitude = decodeDMS( s );
        s = t; t = strchr( s, ';' ); *t = 0; t++;
        double altitude = atoi( s ) * SG_FEET_TO_METER;
-       m_altitude = altitude;
+       m_altitude = (int)altitude;
        s = t; t = strchr( s, ';' ); *t = 0; t++;
        double ualtitude = atoi( s ) * SG_FEET_TO_METER;
        Point3D p( longitude, latitude, altitude+SG_EQUATORIAL_RADIUS_M );
@@ -173,7 +173,7 @@ CMetarStation * CMetarStationDB::find( Point3D locationCart )
 {
     std::map<std::string,CMetarStation*>::iterator itr;
     double bestDist = 99999999;
-    CMetarStation * bestStation;
+    CMetarStation *bestStation = NULL;
     Point3D curLocation = locationCart;
     itr = METAR_Stations.begin(); 
     while(itr != METAR_Stations.end()) 

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index e986d61b9aee4b513216d54f7824a5a728044e9d..ebde34ca362b46d9932efbc96387c1dedcbc2f3c 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -38,7 +38,7 @@
 #include "screen-dump.hxx"
 
 
-#define RGB  3                 // 3 bytes of color info per pixel
+#define RGB3 3                 // 3 bytes of color info per pixel
 #define RGBA 4                 // 4 bytes of color+alpha info
 
 void my_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int win_height, int mode)
@@ -48,7 +48,7 @@ void my_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
     FILE *fp;
     int pixelSize = mode==GL_RGBA?4:3;
 
-    ibuffer = (unsigned char *) malloc(win_width*win_height*RGB);
+    ibuffer = (unsigned char *) malloc(win_width*win_height*RGB3);
 
     if ( (fp = fopen(filename, "wb")) == NULL ) {
        printf("Warning: cannot open %s\n", filename);
@@ -60,15 +60,15 @@ void my_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
     q = 0;
     for (i = 0; i < win_height; i++)
        for (j = 0; j < win_width; j++)
-           for (k = 0; k < RGB; k++)
+           for (k = 0; k < RGB3; k++)
                ibuffer[q++] = (unsigned char)
                    *(buffer + (pixelSize*((win_height-1-i)*win_width+j)+k));
-    fwrite(ibuffer, sizeof(unsigned char), RGB*win_width*win_height, fp);
+    fwrite(ibuffer, sizeof(unsigned char), RGB3*win_width*win_height, fp);
     fclose(fp);
     free(ibuffer);
 
     printf("wrote file (%d x %d pixels, %d bytes)\n",
-          win_width, win_height, RGB*win_width*win_height);
+          win_width, win_height, RGB3*win_width*win_height);
 }
 
 

diff --git a/simgear/sky/cloud.cxx b/simgear/sky/cloud.cxx
index 78bde43cad524ff33a5940be86013e514a9a0fc8..31997dd60bbe5f25962f5fae92044d099ee86a42 100644 (file)
--- a/simgear/sky/cloud.cxx
+++ b/simgear/sky/cloud.cxx
@@ -45,7 +45,7 @@ SGCloudLayer::~SGCloudLayer( void ) {
 }
 
 
-// build the moon object
+// build the cloud object
 void SGCloudLayer::build( double s, double asl, double thickness,
                          double transition, ssgSimpleState *state )
 {