Merge pull request #2524 from heuripedes/master

(menu) Fix heap overflow
This commit is contained in:
Twinaphex 2015-12-05 22:23:12 +01:00
commit f89d9822da
2 changed files with 1 additions and 15 deletions

View File

@ -20,7 +20,6 @@
#include "menu_cbs.h"
#include "menu_display.h"
#include "menu_hash.h"
#include "menu_shader.h"
#include "../general.h"
#include "../frontend/frontend.h"

View File

@ -25,24 +25,11 @@
#include <boolean.h>
#include "menu_driver.h"
#include "menu_shader.h"
#include "../driver.h"
#include "../input/input_driver.h"
#include "../dynamic.h"
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
#ifndef HAVE_SHADER_MANAGER
#define HAVE_SHADER_MANAGER
#endif
#endif
#ifndef GFX_MAX_PARAMETERS
#define GFX_MAX_PARAMETERS 64
#endif
#ifndef GFX_MAX_SHADERS
#define GFX_MAX_SHADERS 16
#endif
#ifndef MAX_COUNTERS
#define MAX_COUNTERS 64
#endif