summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-03-21 19:39:38 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2010-03-21 19:39:38 +0100
commitaab60ae119d170756bcba20c727ae1d045adbee0 (patch)
tree89bdbd617105975a01a1eea0fc344806a0cfd772
parent0c6f0a786cbe5a31df09115774363c1daa5818a2 (diff)
Add -pedantic to default CFLAGS
-rw-r--r--config.mk2
-rw-r--r--src/imlib.c2
-rw-r--r--src/ipc.h2
-rw-r--r--src/winwidget.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/config.mk b/config.mk
index 5e97e65..ff5babc 100644
--- a/config.mk
+++ b/config.mk
@@ -13,7 +13,7 @@ image_dir = $(prefix)/share/feh/images
font_dir = $(prefix)/share/feh/fonts
# default CFLAGS
-CFLAGS = -g -Wall -Wextra -O2
+CFLAGS = -g -Wall -Wextra -pedantic -O2
# Comment these out if you don't have libxinerama
xinerama = -DHAVE_LIBXINERAMA
diff --git a/src/imlib.c b/src/imlib.c
index 00aa6e5..a789e1b 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1044,7 +1044,7 @@ void feh_draw_actions(winwidget w)
}
gib_imlib_get_text_size(fn, "defined actions:", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
-// Check for the widest line
+/* Check for the widest line */
max_tw = tw;
for (i = 0; i < 10; i++) {
diff --git a/src/ipc.h b/src/ipc.h
index 395b150..ac1b814 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -45,7 +45,7 @@ typedef struct {
enum {
IPC_CMD_QUIT,
IPC_CMD_FILELIST_NEXT,
- IPC_CMD_FILELIST_PREV,
+ IPC_CMD_FILELIST_PREV
};
#endif
diff --git a/src/winwidget.c b/src/winwidget.c
index 40d9fd2..c629f68 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -896,9 +896,9 @@ void feh_debug_print_winwid(winwidget w)
"im_x = %d\n" "im_y = %d\n" "zoom = %f\n"
"click_offset_x = %d\n" "click_offset_y = %d\n"
"im_click_offset_x = %d\n" "im_click_offset_y = %d\n"
- "has_rotated = %d\n", w, w->win, w->w, w->h, w->im_w,
- w->im_h, w->im_angle, w->type, w->had_resize, w->im, w->gc,
- w->bg_pmap, w->name, w->file, w->mode, w->im_x, w->im_y,
+ "has_rotated = %d\n", (void *)w, w->win, w->w, w->h, w->im_w,
+ w->im_h, w->im_angle, w->type, w->had_resize, w->im, (void *)w->gc,
+ w->bg_pmap, w->name, (void *)w->file, w->mode, w->im_x, w->im_y,
w->zoom, w->click_offset_x, w->click_offset_y,
w->im_click_offset_x, w->im_click_offset_y, w->has_rotated);
}