aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--main.c2
-rw-r--r--options.h2
-rw-r--r--types.h4
4 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6b55a65..193d415 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/main.c b/main.c
index 55db498..3b5f9b9 100644
--- 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"
diff --git a/options.h b/options.h
index e17f322..eb32cfc 100644
--- 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: */
diff --git a/types.h b/types.h
index 70ae9c4..f09a379 100644
--- 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