FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various MSVC fixes.

Browse Source
This commit is contained in:
curt 2001-07-30 20:34:20 +00:00
parent e04839765d
commit 9ff6934c83
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
simgear/metar/Dcdmetar.cpp
View File

@ -1358,8 +1358,8 @@ static bool vrblVsby( char *string1, char *string2,
Decoded_METAR *Mptr, int *NDEX ) Decoded_METAR *Mptr, int *NDEX )
{ {
char buf[ 6 ]; char buf[ 6 ];
int numerator, /* int numerator,
denominator; denominator; */
char *slash, char *slash,
*V_char, *V_char,
*temp; *temp;
@ -1800,7 +1800,7 @@ static bool isWxToken( char *token )
if( token == NULL ) if( token == NULL )
return FALSE; return FALSE;
for( i = 0; i < strlen(token); i++ ) for( i = 0; i < (int)strlen(token); i++ )
{ {
if( !(isalpha(*(token+i)) || *(token+i) == '+' || if( !(isalpha(*(token+i)) || *(token+i) == '+' ||
*(token+i) == '-' ) ) *(token+i) == '-' ) )
@ -2365,17 +2365,14 @@ int DcdMETAR( char *string , Decoded_METAR *Mptr )
CAVOK, visibility, CAVOK, visibility,
RVR, presentWX, PartialObscur, RVR, presentWX, PartialObscur,
skyCond, tempGroup, skyCond, tempGroup,
altimStng, NotIDed = 99} StartGroup, altimStng, NotIDed = 99 }
SaveStartGroup, StartGroup, SaveStartGroup, MetarGroup;
MetarGroup;
WindStruct *WinDataPtr; // WindStruct *WinDataPtr;
int ndex, int ndex;
NDEX, int NDEX;
i, // int i, jkj, j;
jkj,
j;
char **token, char **token,

34
simgear/metar/Dcdmtrmk.cpp
View File

@ -1,3 +1,5 @@
#include <simgear/compiler.h>
#include "Local.h" /* standard header file */ #include "Local.h" /* standard header file */
#include "Metar.h" #include "Metar.h"
@ -1393,9 +1395,9 @@ static bool isVariableVsby( char **string, Decoded_METAR *Mptr,
/* DECLARE LOCAL VARIABLES */ /* DECLARE LOCAL VARIABLES */
/***************************/ /***************************/
char *slash, char *slash = NULL,
*slash1, *slash1 = NULL,
*slash2, *slash2 = NULL,
buf[ 5 ], buf[ 5 ],
*V_char; *V_char;
float minimumVsby, float minimumVsby,
@ -2788,8 +2790,8 @@ static bool isSLP( char **token, Decoded_METAR *Mptr, int *NDEX )
/* DECLARE LOCAL VARIABLES */ /* DECLARE LOCAL VARIABLES */
/***************************/ /***************************/
int pressure, int pressure;
ndex; // int ndex;
/*************************/ /*************************/
/* BEGIN BODY OF ROUTINE */ /* BEGIN BODY OF ROUTINE */
@ -2861,7 +2863,7 @@ static bool isSectorVsby( char **string, Decoded_METAR *Mptr,
/* DECLARE LOCAL VARIABLES */ /* DECLARE LOCAL VARIABLES */
/***************************/ /***************************/
float vsby; float vsby = 0.0f;
char dd[3], char dd[3],
*slash; *slash;
@ -4791,18 +4793,18 @@ void DcdMTRmk( char **token, Decoded_METAR *Mptr )
FZRANO = 0, TSNO = 0, maintIndicator = 0, CHINO = 0, RVRNO = 0, FZRANO = 0, TSNO = 0, maintIndicator = 0, CHINO = 0, RVRNO = 0,
VISNO = 0, PNO = 0, DVR = 0; VISNO = 0, PNO = 0, DVR = 0;
int NDEX, int NDEX;
ndex, // int ndex;
i; int i;
char *slash, // char *slash;
*tokenX, // char *tokenX;
*V_char, // char *V_char;
*temp_token; // char *temp_token;
bool extra_token, // bool extra_token;
IS_NOT_RMKS; bool IS_NOT_RMKS;
float T_vsby; // float T_vsby;
/*************************/ /*************************/
/* START BODY OF ROUTINE */ /* START BODY OF ROUTINE */

5
simgear/screen/tr.cxx
View File

@ -2,6 +2,9 @@
/* /*
* $Log$ * $Log$
* Revision 1.3 2001/07/30 20:34:21 curt
* Various MSVC fixes.
*
* Revision 1.2 2001/06/27 02:48:01 curt * Revision 1.2 2001/06/27 02:48:01 curt
* Fixed a type conversion bug that could trip up some of the pickier compilers * Fixed a type conversion bug that could trip up some of the pickier compilers
* out there. * out there.
@ -47,6 +50,8 @@
*/ */
#include <simgear/compiler.h>
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>