diff options
| author | Jesse Hall <jessehall@google.com> | 2012-04-26 00:04:38 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-26 00:04:39 -0700 |
| commit | 0c8a719be79b979a039abaf24432de6fbc9b13e6 (patch) | |
| tree | 43d8a4cb02f52978d757b22a9b8144ba8724eb20 /android | |
| parent | 0aa907d99d546deecc4d72ab3c6d5cabee960f57 (diff) | |
| parent | 07ca7c270f22a2b1676395dd88bca340a46dc5d8 (diff) | |
| download | external_qemu-0c8a719be79b979a039abaf24432de6fbc9b13e6.zip external_qemu-0c8a719be79b979a039abaf24432de6fbc9b13e6.tar.gz external_qemu-0c8a719be79b979a039abaf24432de6fbc9b13e6.tar.bz2 | |
Merge "Rename a declaration to fix Mac SDK build"
Diffstat (limited to 'android')
| -rw-r--r-- | android/opengles.c | 2 | ||||
| -rw-r--r-- | android/opengles.h | 6 |
2 files changed, 4 insertions, 4 deletions
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); |