From: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
Date: Wed, 4 Sep 2013 09:51:46 +0000 (+0200)
Subject: VirtGL: Fix warnings about g_malloc, g_free, g_realloc.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~749^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33ac5b9bcc00452eebb307fc50584499178aa8ae;p=sdk%2Femulator%2Fqemu.git

VirtGL: Fix warnings about g_malloc, g_free, g_realloc.

There are multiple definitions of these funcs, it induces warnings.
In file included from opengl_exec.c:64:0:
range_alloc.h:29:7: attention : redundant redeclaration of ‘g_malloc’ [-Wredundant-decls]
/usr/include/glib-2.0/glib/gmem.h:72:10: note: previous declaration of ‘g_malloc’ was here
tizen/src/hw/range_alloc.h:30:7: attention : redundant redeclaration of ‘g_realloc’ [-Wredundant-decls]
/usr/include/glib-2.0/glib/gmem.h:74:10: note: previous declaration of ‘g_realloc’ was here
tizen/src/hw/range_alloc.h:31:6: attention : redundant redeclaration of ‘g_free’ [-Wredundant-decls]
/usr/include/glib-2.0/glib/gmem.h:70:7: note: previous declaration of ‘g_free’ was here
tizen/src/hw/opengl_exec.c:114:7: attention : redundant redeclaration of ‘g_malloc’ [-Wredundant-decls]
tizen/src/hw/range_alloc.h:29:7: note: previous declaration of ‘g_malloc’ was here
tizen/src/hw/opengl_exec.c:115:7: attention : redundant redeclaration of ‘g_realloc’ [-Wredundant-decls]
tizen/src/hw/range_alloc.h:30:7: note: previous declaration of ‘g_realloc’ was here
tizen/src/hw/opengl_exec.c:116:6: attention : redundant redeclaration of ‘g_free’ [-Wredundant-decls]
tizen/src/hw/range_alloc.h:31:6: note: previous declaration of ‘g_free’ was here

Change-Id: I9e2557851216a44f970e83dd8ed16cb0e5e5f0d6
---

diff --git a/tizen/src/hw/opengl_exec.c b/tizen/src/hw/opengl_exec.c
index c18bcceab0..93fbff2187 100644
--- a/tizen/src/hw/opengl_exec.c
+++ b/tizen/src/hw/opengl_exec.c
@@ -111,10 +111,6 @@ const GLXFBConfig FBCONFIGS[] = {
 #define FAKE_GLX_VERSION_MAJOR 1
 #define FAKE_GLX_VERSION_MINOR 2
 
-void *g_malloc(size_t size);
-void *g_realloc(void *ptr, size_t size);
-void g_free(void *ptr);
-
 /*#define glGetError() 0*/
 
 #ifdef WIN32
diff --git a/tizen/src/hw/range_alloc.h b/tizen/src/hw/range_alloc.h
index c1a8d779bc..66d26b750a 100644
--- a/tizen/src/hw/range_alloc.h
+++ b/tizen/src/hw/range_alloc.h
@@ -26,10 +26,6 @@
 #ifndef _OPENGL_UTILS
 #define _OPENGL_UTILS
 
-void *g_malloc(size_t size);
-void *g_realloc(void *ptr, size_t size);
-void g_free(void *ptr);
-
 typedef struct {
     unsigned int *values;
     int nbValues;