@@ -4,7 +4,7 @@ PREFIX = /usr/local | |||||
MANPREFIX = $(PREFIX)/share/man | MANPREFIX = $(PREFIX)/share/man | ||||
CC = gcc | CC = gcc | ||||
CFLAGS = -ansi -Wall -pedantic -O2 -I$(PREFIX) | CFLAGS = -Wall -pedantic -O2 -I$(PREFIX) | ||||
LDFLAGS = -L$(PREFIX) | LDFLAGS = -L$(PREFIX) | ||||
LIBS = -lX11 -lImlib2 -lgif | LIBS = -lX11 -lImlib2 -lgif | ||||
@@ -29,11 +29,11 @@ | |||||
#include <X11/Xutil.h> | #include <X11/Xutil.h> | ||||
#include <X11/keysym.h> | #include <X11/keysym.h> | ||||
#include "types.h" | |||||
#include "commands.h" | #include "commands.h" | ||||
#include "image.h" | #include "image.h" | ||||
#include "options.h" | #include "options.h" | ||||
#include "thumbs.h" | #include "thumbs.h" | ||||
#include "types.h" | |||||
#include "util.h" | #include "util.h" | ||||
#include "window.h" | #include "window.h" | ||||
#include "config.h" | #include "config.h" | ||||
@@ -19,8 +19,8 @@ | |||||
#ifndef OPTIONS_H | #ifndef OPTIONS_H | ||||
#define OPTIONS_H | #define OPTIONS_H | ||||
#include "image.h" | |||||
#include "types.h" | #include "types.h" | ||||
#include "image.h" | |||||
typedef struct { | typedef struct { | ||||
/* file list: */ | /* file list: */ | ||||
@@ -1,6 +1,10 @@ | |||||
#ifndef TYPES_H | #ifndef TYPES_H | ||||
#define TYPES_H | #define TYPES_H | ||||
#undef bool | |||||
#undef false | |||||
#undef true | |||||
typedef enum { | typedef enum { | ||||
false, | false, | ||||
true | true | ||||