From 07ca7c270f22a2b1676395dd88bca340a46dc5d8 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Wed, 25 Apr 2012 22:05:07 -0700 Subject: Rename a declaration to fix Mac SDK build GCC on OS X is flagging a duplicate declaration error even though GCC on Linux isn't even warning about it. Not sure why. The declaration is duplicated, but identical. Renaming one of the two. Change-Id: I946b5f3a4e410b66e9ab2ae3160ff1bec4e0ddd7 --- android/opengles.c | 2 +- android/opengles.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'android') diff --git a/android/opengles.c b/android/opengles.c index 025f7dd..e90a477 100644 --- a/android/opengles.c +++ b/android/opengles.c @@ -133,7 +133,7 @@ BAD_EXIT: } int -android_startOpenglesRenderer(int width, int height, OnPostFn onPost, void* onPostContext) +android_startOpenglesRenderer(int width, int height, OnPostFunc onPost, void* onPostContext) { if (!rendererLib) { D("Can't start OpenGLES renderer without support libraries"); diff --git a/android/opengles.h b/android/opengles.h index 7bb6a3a..60e125d 100644 --- a/android/opengles.h +++ b/android/opengles.h @@ -17,8 +17,8 @@ #define ANDROID_OPENGLES_BASE_PORT 22468 /* See the description in render_api.h. */ -typedef void (*OnPostFn)(void* context, int width, int height, int ydir, - int format, int type, unsigned char* pixels); +typedef void (*OnPostFunc)(void* context, int width, int height, int ydir, + int format, int type, unsigned char* pixels); /* Call this function to initialize the hardware opengles emulation. * This function will abort if we can't find the corresponding host @@ -31,7 +31,7 @@ int android_initOpenglesEmulation(void); * may be NULL. */ int android_startOpenglesRenderer(int width, int height, - OnPostFn onPost, void* onPostContext); + OnPostFunc onPost, void* onPostContext); int android_showOpenglesWindow(void* window, int x, int y, int width, int height, float rotation); -- cgit v1.1