Shut up some more warnings.

This commit is contained in:
Alcaro 2015-09-06 16:07:26 +02:00
parent 07de6af33e
commit dbccc4f4f0
3 changed files with 5 additions and 4 deletions

2
deps/zlib/zutil.c vendored
View File

@ -10,7 +10,7 @@
# include "gzguts.h"
#endif
char * const z_errmsg[10] = {
char z_errmsg[10][21] = {
"need dictionary", /* Z_NEED_DICT 2 */
"stream end", /* Z_STREAM_END 1 */
"", /* Z_OK 0 */

View File

@ -526,7 +526,7 @@ static bool gfx_ctx_wgl_set_video_mode(void *data,
{
if (!fullscreen && settings->ui.menubar_enable)
{
RECT rc_temp = {0, 0, height, 0x7FFF};
RECT rc_temp = {0, 0, (LONG)height, 0x7FFF};
SetMenu(g_hwnd, LoadMenu(GetModuleHandle(NULL),MAKEINTRESOURCE(IDR_MENU)));
SendMessage(g_hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&rc_temp);
g_resize_height = height += rc_temp.top + rect.top;

View File

@ -49,8 +49,9 @@ typedef unsigned short ush;
typedef ush FAR ushf;
typedef unsigned long ulg;
extern char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* (size given to avoid silly warnings with Visual C++) */
extern char z_errmsg[10][21]; /* indexed by 2-zlib_error */
/* (array size given to avoid silly warnings with Visual C++) */
/* (array entry size given to avoid silly string cast warnings) */
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]