[waffle] [PATCH] android: Fold nearly all headers into waffle.h

[groleo at gmail.com]

From: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>

also one c99-ism in wcore_config_attrs.c

Signed-off-by: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>
---
 Android.mk                           | 13 +------------
 src/waffle/core/wcore_config_attrs.c |  6 ++++--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Android.mk b/Android.mk
index 09ef5c6..f7c42c5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,22 +82,11 @@ LOCAL_GENERATED_SOURCES := \
     $(LOCAL_PATH)/include/waffle_version.h
 
 LOCAL_COPY_HEADERS := \
-    include/waffle/waffle_attrib_list.h \
-    include/waffle/waffle_config.h \
-    include/waffle/waffle_context.h \
-    include/waffle/waffle_display.h \
-    include/waffle/waffle_dl.h \
-    include/waffle/waffle_enum.h \
-    include/waffle/waffle_error.h \
+    include/waffle/waffle.h \
     include/waffle/waffle_gbm.h \
-    include/waffle/waffle_gl_misc.h \
     include/waffle/waffle_glx.h \
-    include/waffle/waffle.h \
-    include/waffle/waffle_init.h \
-    include/waffle/waffle_portability.h \
     include/waffle/waffle_version.h \
     include/waffle/waffle_wayland.h \
-    include/waffle/waffle_window.h \
     include/waffle/waffle_x11_egl.h \
 
 LOCAL_COPY_HEADERS_TO := waffle-$(waffle_major_version)
diff --git a/src/waffle/core/wcore_config_attrs.c b/src/waffle/core/wcore_config_attrs.c
index 1276e56..d100b97 100644
--- a/src/waffle/core/wcore_config_attrs.c
+++ b/src/waffle/core/wcore_config_attrs.c
@@ -41,7 +41,8 @@ check_keys(const int32_t attrib_list[])
     if (attrib_list == NULL)
         return true;
 
-    for (int32_t i = 0; attrib_list[i]; i += 2) {
+    int32_t i;
+    for (i = 0; attrib_list[i]; i += 2) {
         int32_t key = attrib_list[i];
 
         switch (key) {
@@ -298,7 +299,8 @@ static bool
 parse_misc(struct wcore_config_attrs *attrs,
            const int32_t attrib_list[])
 {
-    for (int32_t i = 0; attrib_list[i]; i += 2) {
+    int32_t i;
+    for (i = 0; attrib_list[i]; i += 2) {
         int32_t key = attrib_list[i + 0];
         int32_t value = attrib_list[i + 1];
 
-- 
1.8.0