From ee4b4cb933ca85090e5ffbbea0640be76a451e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 11 Apr 2012 09:43:53 -0400 Subject: [PATCH] shared: Use $(GCC_CFLAGS), fix warnings --- shared/Makefile.am | 1 + shared/image-loader.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/shared/Makefile.am b/shared/Makefile.am index d77060cc..71816f0c 100644 --- 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 029b92e1..21b20a23 100644 --- a/shared/image-loader.c +++ b/shared/image-loader.c @@ -29,6 +29,8 @@ #include #include +#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)