shared: Use $(GCC_CFLAGS), fix warnings

diff --git a/shared/Makefile.am b/shared/Makefile.am
index d77060c..71816f0 100644 (file)
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,5 +1,6 @@
 libconfig_parser_la_LIBADD = $(IMAGE_LIBS)
 AM_CPPFLAGS = $(IMAGE_CFLAGS)
+AM_CFLAGS = $(GCC_CFLAGS)
 
 noinst_LTLIBRARIES = libconfig-parser.la
 libconfig_parser_la_SOURCES =                  \

diff --git a/shared/image-loader.c b/shared/image-loader.c
index 029b92e..21b20a2 100644 (file)
--- a/shared/image-loader.c
+++ b/shared/image-loader.c
@@ -29,6 +29,8 @@
 #include <png.h>
 #include <pixman.h>
 
+#include "config-parser.h"
+
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
 
 #ifdef HAVE_WEBP
@@ -67,7 +69,8 @@ load_jpeg(FILE *fp)
 {
        struct jpeg_decompress_struct cinfo;
        struct jpeg_error_mgr jerr;
-       int stride, i, first;
+       unsigned int i;
+       int stride, first;
        JSAMPLE *data, *rows[4];
        jmp_buf env;
 
@@ -350,7 +353,7 @@ load_image(const char *filename)
        pixman_image_t *image;
        unsigned char header[4];
        FILE *fp;
-       int i;
+       unsigned int i;
 
        fp = fopen(filename, "rb");
        if (fp == NULL)