From 29d394b9ba4d7a23524fc6fba6da6e043085744b Mon Sep 17 00:00:00 2001 From: Tapani Pälli Date: Mon, 13 Aug 2012 09:03:06 +0300 Subject: android: fix liblog API changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit android logging macros changed their name in JellyBean. Signed-off-by: Bruce E. Robertson Signed-off-by: Tapani Pälli Signed-off-by: Chad Versace --- src/egl/drivers/dri2/platform_android.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 66142cdee5f..7e57295e8fa 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -660,18 +660,29 @@ droid_open_device(void) return (fd >= 0) ? dup(fd) : -1; } +/* support versions < JellyBean */ +#ifndef ALOGW +#define ALOGW LOGW +#endif +#ifndef ALOGD +#define ALOGD LOGD +#endif +#ifndef ALOGI +#define ALOGI LOGI +#endif + static void droid_log(EGLint level, const char *msg) { switch (level) { case _EGL_DEBUG: - LOGD("%s", msg); + ALOGD("%s", msg); break; case _EGL_INFO: - LOGI("%s", msg); + ALOGI("%s", msg); break; case _EGL_WARNING: - LOGW("%s", msg); + ALOGW("%s", msg); break; case _EGL_FATAL: LOG_FATAL("%s", msg); -- cgit v1.2.3