VC warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
08dd04d082
commit
cde6d2e7d8
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,18 @@
|
||||
/* Copyright: (c) Julian Smart */
|
||||
/* Licence: wxWindows Licence */
|
||||
/* include platform.h first to get __WIN32__ definition */
|
||||
|
||||
#include "wx/platform.h"
|
||||
#include "wx/setup.h"
|
||||
#include "wx/deprecated/setup.h"
|
||||
|
||||
#if !defined(wxUSE_PROLOGIO) || wxUSE_PROLOGIO
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4244) /* warning C4244: '=' : conversion from 'A' to 'B', possible loss of data */
|
||||
#endif
|
||||
|
||||
#if !defined(lint) && 0
|
||||
static char yysccsid[] = "@(#)yaccpar 1.7 (Berkeley) 09/09/90";
|
||||
#endif
|
||||
@ -260,7 +266,7 @@ void yyerror(char *s)
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// #line 247 "y_tab.c"
|
||||
#define YYABORT goto yyabort
|
||||
#define YYACCEPT goto yyaccept
|
||||
@ -539,4 +545,8 @@ yyaccept:
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif /* wxUSE_PROLOGIO */
|
||||
|
@ -464,8 +464,10 @@ update(
|
||||
} else if (sr > -32768) {
|
||||
mag = -sr;
|
||||
state_ptr->sr[0] = base2(mag) - 0x400;
|
||||
} else
|
||||
state_ptr->sr[0] = short (0xFC20);
|
||||
} else {
|
||||
const unsigned short c = 0xFC20;
|
||||
state_ptr->sr[0] = short(c);
|
||||
}
|
||||
|
||||
/* DELAY A */
|
||||
state_ptr->pk[1] = state_ptr->pk[0];
|
||||
|
Loading…
Reference in New Issue
Block a user