From 48a48d9bf587e944d458f55dae35688985c2f678 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Mon, 23 Dec 2013 22:36:30 -0800 Subject: [PATCH] Fixes for MinGW GCC 4.8.1. --- 3rdparty/stb_image/stb_image.c | 3 ++- examples/14-shadowvolumes/shadowvolumes.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/3rdparty/stb_image/stb_image.c b/3rdparty/stb_image/stb_image.c index c40f8e1ed..5c2ed5716 100644 --- a/3rdparty/stb_image/stb_image.c +++ b/3rdparty/stb_image/stb_image.c @@ -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 diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index d0f769dba..37662b1e8 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -3,6 +3,14 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ +#include +#include + +#include +#include +#include +#include + namespace std { namespace tr1 {} } using namespace std::tr1; @@ -18,14 +26,6 @@ using namespace std::tr1; #include "fpumath.h" #include "imgui/imgui.h" -#include -#include - -#include -#include -#include -#include - #define SV_USE_SIMD 1 #define MAX_INSTANCE_COUNT 25 #define MAX_LIGHTS_COUNT 5