Merge pull request #1518 from heuripedes/cxx-build

Cxx build
This commit is contained in:
Twinaphex 2015-03-16 18:48:11 +01:00
commit 7a2e1e085f
4 changed files with 7 additions and 7 deletions

View File

@ -148,7 +148,7 @@ static SRes Utf16_To_Char(CBuf *buf, const uint16_t *s, int fileMode)
} }
} }
#else #else
fileMode = fileMode; (void)fileMode;
return Utf16_To_Utf8Buf(buf, s, len); return Utf16_To_Utf8Buf(buf, s, len);
#endif #endif
} }

8
deps/7zip/7zAlloc.c vendored
View File

@ -5,7 +5,7 @@
void *SzAlloc(void *p, size_t size) void *SzAlloc(void *p, size_t size)
{ {
p = p; (void)p;
if (size == 0) if (size == 0)
return 0; return 0;
return malloc(size); return malloc(size);
@ -13,13 +13,13 @@ void *SzAlloc(void *p, size_t size)
void SzFree(void *p, void *address) void SzFree(void *p, void *address)
{ {
p = p; (void)p;
free(address); free(address);
} }
void *SzAllocTemp(void *p, size_t size) void *SzAllocTemp(void *p, size_t size)
{ {
p = p; (void)p;
if (size == 0) if (size == 0)
return 0; return 0;
return malloc(size); return malloc(size);
@ -27,6 +27,6 @@ void *SzAllocTemp(void *p, size_t size)
void SzFreeTemp(void *p, void *address) void SzFreeTemp(void *p, void *address)
{ {
p = p; (void)p;
free(address); free(address);
} }

View File

@ -392,7 +392,7 @@ static bool gfx_ctx_drm_egl_init(void *data)
gfx_ctx_drm_egl_data_t *drm = (gfx_ctx_drm_egl_data_t*)calloc(1, sizeof(gfx_ctx_drm_egl_data_t)); gfx_ctx_drm_egl_data_t *drm = (gfx_ctx_drm_egl_data_t*)calloc(1, sizeof(gfx_ctx_drm_egl_data_t));
if (!drm) if (!drm)
return NULL; return false;
drm->g_drm_fd = -1; drm->g_drm_fd = -1;
gpu_descriptors = (struct string_list*)dir_list_new("/dev/dri", NULL, false); gpu_descriptors = (struct string_list*)dir_list_new("/dev/dri", NULL, false);

View File

@ -68,7 +68,7 @@ static bool sdl_key_pressed(int key)
#else #else
keymap = SDL_GetKeyState(&num_keys); keymap = SDL_GetKeyState(&num_keys);
#endif #endif
if (sym < 0 || sym >= (unsigned)num_keys) if (sym >= (unsigned)num_keys)
return false; return false;
return keymap[sym]; return keymap[sym];