Mesa (master): egl: fix android logger compilation
Emil Velikov
evelikov at kemper.freedesktop.org
Mon May 15 15:10:55 UTC 2017
Module: Mesa
Branch: master
Commit: 0aa578714e9d664ab15d2bfb70102505928d8119
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aa578714e9d664ab15d2bfb70102505928d8119
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Fri May 12 09:32:15 2017 +0300
egl: fix android logger compilation
1ce5853 broken compilation since LOG_ERROR is not defined and also
macro expansion won't work as planned (expands to 'ANDROID_egl2alog[level]')
v2: append 'ANDROID' to egl2alog table and use LOG_PRI
(suggested by Chih-Wei Huang)
Fixes: 1ce5853 ("egl: simplify the Android logger")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/egl/main/egllog.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index 6de2a50b45..64ff474c65 100644
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -82,12 +82,12 @@ _eglDefaultLogger(EGLint level, const char *msg)
{
#ifdef HAVE_ANDROID_PLATFORM
static const int egl2alog[] = {
- [_EGL_FATAL] = LOG_ERROR,
- [_EGL_WARNING] = LOG_WARN,
- [_EGL_INFO] = LOG_INFO,
- [_EGL_DEBUG] = LOG_DEBUG,
+ [_EGL_FATAL] = ANDROID_LOG_ERROR,
+ [_EGL_WARNING] = ANDROID_LOG_WARN,
+ [_EGL_INFO] = ANDROID_LOG_INFO,
+ [_EGL_DEBUG] = ANDROID_LOG_DEBUG,
};
- ALOG(egl2alog[level], LOG_TAG, "%s", msg);
+ LOG_PRI(egl2alog[level], LOG_TAG, "%s", msg);
#else
fprintf(stderr, "libEGL %s: %s\n", level_strings[level], msg);
#endif /* HAVE_ANDROID_PLATFORM */
More information about the mesa-commit
mailing list