Fixes for MinGW GCC 4.8.1.
This commit is contained in:
parent
835131d69f
commit
48a48d9bf5
3
3rdparty/stb_image/stb_image.c
vendored
3
3rdparty/stb_image/stb_image.c
vendored
@ -4171,7 +4171,8 @@ static uint8 *stbi_gif_load_next(stbi *s, stbi_gif *g, int *comp, int req_comp)
|
||||
static stbi_uc *stbi_gif_load(stbi *s, int *x, int *y, int *comp, int req_comp)
|
||||
{
|
||||
uint8 *u = 0;
|
||||
stbi_gif g={0};
|
||||
stbi_gif g;
|
||||
memset(&g, 0, sizeof(g) );
|
||||
|
||||
u = stbi_gif_load_next(s, &g, comp, req_comp);
|
||||
if (u == (void *) 1) u = 0; // end of animated gif marker
|
||||
|
@ -3,6 +3,14 @@
|
||||
* License: http://www.opensource.org/licenses/BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
#include <map>
|
||||
|
||||
namespace std { namespace tr1 {} }
|
||||
using namespace std::tr1;
|
||||
|
||||
@ -18,14 +26,6 @@ using namespace std::tr1;
|
||||
#include "fpumath.h"
|
||||
#include "imgui/imgui.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
#include <map>
|
||||
|
||||
#define SV_USE_SIMD 1
|
||||
#define MAX_INSTANCE_COUNT 25
|
||||
#define MAX_LIGHTS_COUNT 5
|
||||
|
Loading…
Reference in New Issue
Block a user