Fixed issue #73

2012-12-27 16:34:51 +01:00 · 2012-12-27 16:34:51 +01:00 · cd929eabfe
parent b542d63f96
commit cd929eabfe
4 changed files with 7 additions and 3 deletions
--- a/2
+++ b/2
@ -4,7 +4,7 @@ PREFIX    = /usr/local
 MANPREFIX = $(PREFIX)/share/man

 CC      = gcc
-CFLAGS  = -ansi -Wall -pedantic -O2 -I$(PREFIX)
+CFLAGS  = -Wall -pedantic -O2 -I$(PREFIX)
 LDFLAGS = -L$(PREFIX)
 LIBS    = -lX11 -lImlib2 -lgif

--- a/main.c
+++ b/main.c
@ -29,11 +29,11 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>

+#include "types.h"
 #include "commands.h"
 #include "image.h"
 #include "options.h"
 #include "thumbs.h"
-#include "types.h"
 #include "util.h"
 #include "window.h"
 #include "config.h"
--- a/options.h
+++ b/options.h
@ -19,8 +19,8 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H

-#include "image.h"
 #include "types.h"
+#include "image.h"

 typedef struct {
 	/* file list: */
--- a/types.h
+++ b/types.h
@ -1,6 +1,10 @@
 #ifndef TYPES_H
 #define TYPES_H

+#undef bool
+#undef false
+#undef true
+
 typedef enum {
 	false,
 	true