summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-10-24 20:52:09 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-10-27 16:12:38 +0900
commit5a9d8d6f032b816cd435aacef49af8b86375400b (patch)
treeb0e2aa97ff595859f0fe534d71e2878f25308453 /src
parent3fe232cd95873396155f4bcac007cd5e62d237bd (diff)
Evas GL: string_query returns a const char *
Why cast to/from void* in the first place?
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_gl.c2
-rw-r--r--src/lib/evas/include/evas_private.h2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index 98b95e0be5..3373bb447e 100644
--- a/src/lib/evas/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
@@ -517,7 +517,7 @@ evas_gl_string_query(Evas_GL *evas_gl, int name)
517 return ""; 517 return "";
518 MAGIC_CHECK_END(); 518 MAGIC_CHECK_END();
519 519
520 return (const char *)evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output, name); 520 return evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output, name);
521} 521}
522 522
523EAPI Evas_GL_Func 523EAPI Evas_GL_Func
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 6f715b463a..eff901bb83 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1250,7 +1250,7 @@ struct _Evas_Func
1250 void *(*gl_context_create) (void *data, void *share_context, int version); 1250 void *(*gl_context_create) (void *data, void *share_context, int version);
1251 int (*gl_context_destroy) (void *data, void *context); 1251 int (*gl_context_destroy) (void *data, void *context);
1252 int (*gl_make_current) (void *data, void *surface, void *context); 1252 int (*gl_make_current) (void *data, void *surface, void *context);
1253 void *(*gl_string_query) (void *data, int name); 1253 const char *(*gl_string_query) (void *data, int name);
1254 void *(*gl_proc_address_get) (void *data, const char *name); 1254 void *(*gl_proc_address_get) (void *data, const char *name);
1255 int (*gl_native_surface_get) (void *data, void *surface, void *native_surface); 1255 int (*gl_native_surface_get) (void *data, void *surface, void *native_surface);
1256 void *(*gl_api_get) (void *data, int version); 1256 void *(*gl_api_get) (void *data, int version);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index b2a1ea114f..9cfddd1041 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1199,11 +1199,11 @@ eng_gl_rotation_angle_get(void *data)
1199 return evgl_engine->funcs->rotation_angle_get(data); 1199 return evgl_engine->funcs->rotation_angle_get(data);
1200} 1200}
1201 1201
1202static void * 1202static const char *
1203eng_gl_string_query(void *data, int name) 1203eng_gl_string_query(void *data, int name)
1204{ 1204{
1205 EVGLINIT(data, NULL); 1205 EVGLINIT(data, NULL);
1206 return (void *)evgl_string_query(name); 1206 return evgl_string_query(name);
1207} 1207}
1208 1208
1209// Need to deprecate this function.. 1209// Need to deprecate this function..
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index f6b3420cce..48e063debe 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -2559,7 +2559,7 @@ eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context)
2559} 2559}
2560 2560
2561// FIXME!!! Implement later 2561// FIXME!!! Implement later
2562static void * 2562static const char *
2563eng_gl_string_query(void *data EINA_UNUSED, int name EINA_UNUSED) 2563eng_gl_string_query(void *data EINA_UNUSED, int name EINA_UNUSED)
2564{ 2564{
2565 return NULL; 2565 return NULL;