From 74c3fe766e8565997e46b347dc4358da04801678 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Sat, 15 Oct 2011 09:30:33 +0000 Subject: [PATCH] Evas: Remove a useless ifdef that was causing dead code. You can't compile a gl_common .c file based on whether or not the SDL header was included. The .c file will result in only one .o and since the Evas_Engine_Sdl.h is not included by evas_gl_context.c itself, then that ifdef will never be true. gl_common should request a callback function pointer from the evas engine for doing symbol resolution. This needs a refactor. SVN revision: 64086 --- .../src/modules/engines/gl_common/evas_gl_context.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index 49551f5220..133cb0b193 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -48,11 +48,11 @@ gl_symbols(void) if (sym_done) return; sym_done = 1; -#ifdef _EVAS_ENGINE_SDL_H -# define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)SDL_GL_GetProcAddress(sym) -#else -# define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym) -#endif + /* FIXME: If using the SDL engine, we should use SDL_GL_GetProcAddress + * instead of dlsym + * if (!dst) dst = (typ)SDL_GL_GetProcAddress(sym) + */ +#define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym) #define FALLBAK(dst, typ) if (!dst) dst = (typ)sym_missing; FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", glsym_func_void);