egl: fix android logger compilation
authorTapani Pälli <tapani.palli@intel.com>
Fri, 12 May 2017 06:32:15 +0000 (09:32 +0300)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 15 May 2017 15:03:51 +0000 (16:03 +0100)
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@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/egl/main/egllog.c

index 6de2a50b451d5f2df2f9a24870885cacc3efee02..64ff474c65c46078f9e5b7f53f4b5701b3832cae 100644 (file)
@@ -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 */