Fix calling convention mismatch on Windows.

Conflicts:

	tizen/src/hw/opengl_exec.c

Change-Id: I7f8e980b105ba11a83279d5aa2bfb28b92143f24

diff --git a/tizen/src/hw/opengl_exec.c b/tizen/src/hw/opengl_exec.c
index 3f8f7dfbd20e0e1f608d04257e4e5e2846839f27..41cd7fd81535630675c3809d173d56f3b4fb3945 100644 (file)
--- a/tizen/src/hw/opengl_exec.c
+++ b/tizen/src/hw/opengl_exec.c
@@ -117,28 +117,28 @@ void g_free(void *ptr);
 /*#define glGetError() 0*/
 
 #ifdef WIN32
-#      define CCONV __stdcall
+#      define CCONV _stdcall   /* DLL entry points are WINAPI */
 #else
 #      define CCONV
 #endif
 
 #define GET_EXT_PTR(type, funcname, args_decl) \
     static int detect_##funcname = 0; \
-    static type(*ptr_func_##funcname)args_decl = NULL; \
+    static type CCONV (*ptr_func_##funcname)args_decl = NULL; \
     if (detect_##funcname == 0) \
     { \
         detect_##funcname = 1; \
-        ptr_func_##funcname = (type(*)args_decl)glo_getprocaddress((const char*)#funcname); \
+        ptr_func_##funcname = (type CCONV (*)args_decl)glo_getprocaddress((const char*)#funcname); \
         assert (ptr_func_##funcname); \
     }
 
 #define GET_EXT_PTR_NO_FAIL(type, funcname, args_decl) \
     static int detect_##funcname = 0; \
-    static type(CCONV *ptr_func_##funcname)args_decl = NULL; \
+    static type CCONV (*ptr_func_##funcname)args_decl = NULL; \
     if (detect_##funcname == 0) \
     { \
         detect_##funcname = 1; \
-        ptr_func_##funcname = (type(CCONV *)args_decl)glo_getprocaddress((const char*)#funcname); \
+        ptr_func_##funcname = (type CCONV (*)args_decl)glo_getprocaddress((const char*)#funcname); \
     }
 
 #ifndef WIN32
@@ -172,11 +172,11 @@ static void *get_glu_ptr(const char *name)
 
 #define GET_GLU_PTR(type, funcname, args_decl) \
     static int detect_##funcname = 0; \
-    static type(*ptr_func_##funcname)args_decl = NULL; \
+    static type CCONV (*ptr_func_##funcname)args_decl = NULL; \
     if (detect_##funcname == 0) \
     { \
         detect_##funcname = 1; \
-        ptr_func_##funcname = (type(*)args_decl)get_glu_ptr(#funcname); \
+        ptr_func_##funcname = (type CCONV (*)args_decl)get_glu_ptr(#funcname); \
     }
 
 int display_function_call = 0;