encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiling of three test programs with C++.

This commit is contained in:
Philipp Wiesemann 2016-10-09 20:31:32 +02:00
parent f9b15a94ec
commit 367a6a3ddf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/testgles.c
View File

@ -173,7 +173,7 @@ main(int argc, char *argv[])
quit(2); quit(2);
} }
context = SDL_calloc(state->num_windows, sizeof(context)); context = (SDL_GLContext *)SDL_calloc(state->num_windows, sizeof(context));
if (context == NULL) { if (context == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n"); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2); quit(2);

4
test/testgles2.c
View File

@ -546,7 +546,7 @@ main(int argc, char *argv[])
return 0; return 0;
} }
context = SDL_calloc(state->num_windows, sizeof(context)); context = (SDL_GLContext *)SDL_calloc(state->num_windows, sizeof(context));
if (context == NULL) { if (context == NULL) {
SDL_Log("Out of memory!\n"); SDL_Log("Out of memory!\n");
quit(2); quit(2);
@ -640,7 +640,7 @@ main(int argc, char *argv[])
} }
} }
datas = SDL_calloc(state->num_windows, sizeof(shader_data)); datas = (shader_data *)SDL_calloc(state->num_windows, sizeof(shader_data));
/* Set rendering settings for each context */ /* Set rendering settings for each context */
for (i = 0; i < state->num_windows; ++i) { for (i = 0; i < state->num_windows; ++i) {

6
test/testime.c
View File

@ -110,7 +110,7 @@ static void unifont_init(const char *fontname)
const size_t unifontTextureSize = UNIFONT_NUM_TEXTURES * state->num_windows * sizeof(void *); const size_t unifontTextureSize = UNIFONT_NUM_TEXTURES * state->num_windows * sizeof(void *);
/* Allocate memory for the glyph data so the file can be closed after initialization. */ /* Allocate memory for the glyph data so the file can be closed after initialization. */
unifontGlyph = SDL_malloc(unifontGlyphSize); unifontGlyph = (struct UnifontGlyph *)SDL_malloc(unifontGlyphSize);
if (unifontGlyph == NULL) if (unifontGlyph == NULL)
{ {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for glyph data.\n", (int)(unifontGlyphSize + 1023) / 1024); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for glyph data.\n", (int)(unifontGlyphSize + 1023) / 1024);
@ -119,7 +119,7 @@ static void unifont_init(const char *fontname)
SDL_memset(unifontGlyph, 0, unifontGlyphSize); SDL_memset(unifontGlyph, 0, unifontGlyphSize);
/* Allocate memory for texture pointers for all renderers. */ /* Allocate memory for texture pointers for all renderers. */
unifontTexture = SDL_malloc(unifontTextureSize); unifontTexture = (SDL_Texture **)SDL_malloc(unifontTextureSize);
if (unifontTexture == NULL) if (unifontTexture == NULL)
{ {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for texture pointer data.\n", (int)(unifontTextureSize + 1023) / 1024); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for texture pointer data.\n", (int)(unifontTextureSize + 1023) / 1024);
@ -270,7 +270,7 @@ static void unifont_load_texture(Uint32 textureID)
exit(-1); exit(-1);
} }
textureRGBA = SDL_malloc(UNIFONT_TEXTURE_SIZE); textureRGBA = (Uint8 *)SDL_malloc(UNIFONT_TEXTURE_SIZE);
if (textureRGBA == NULL) if (textureRGBA == NULL)
{ {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d MiB for a texture.\n", UNIFONT_TEXTURE_SIZE / 1024 / 1024); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d MiB for a texture.\n", UNIFONT_TEXTURE_SIZE / 1024 / 1024);