From 03bfe1015e7e67104c2872bdcf085b1315b24a4c Mon Sep 17 00:00:00 2001 From: Bert Date: Sun, 30 Jan 2011 16:39:16 +0100 Subject: Explicitly enable printing of warnings --- sxiv.h | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'sxiv.h') diff --git a/sxiv.h b/sxiv.h index 837ae73..15db96e 100644 --- a/sxiv.h +++ b/sxiv.h @@ -20,26 +20,29 @@ #define SXIV_H #include "config.h" +#include "options.h" #define ABS(a) ((a) < 0 ? (-(a)) : (a)) #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define WARN(...) \ - do { \ - fprintf(stderr, "sxiv: %s:%d: warning: ", __FILE__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - fprintf(stderr, "\n"); \ - } while (0) +#define WARN(...) \ + do { \ + if (options->warn) { \ + fprintf(stderr, "sxiv: %s:%d: warning: ", __FILE__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ + } \ + } while (0) -#define DIE(...) \ - do { \ - fprintf(stderr, "sxiv: %s:%d: error: ", __FILE__, __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - fprintf(stderr, "\n"); \ - cleanup(); \ - exit(1); \ - } while (0) +#define DIE(...) \ + do { \ + fprintf(stderr, "sxiv: %s:%d: error: ", __FILE__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ + cleanup(); \ + exit(1); \ + } while (0) void cleanup(); -- cgit v1.2.3