commit f78edd632d32b70e16e0e3d34ce24bc3c4bb930a
parent 35b8464b42624abc7ff7e84cf3adf3aefbddd7ee
Author: Frederic Cambus <fred@statdns.com>
Date: Sat, 27 Oct 2018 13:23:28 +0200
Remove unnecessary dots in paths, we can now include headers directly
Diffstat:
15 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/src/clean.c b/src/clean.c
@@ -10,7 +10,7 @@
//
#include <stddef.h>
-#include "../include/ansilove.h"
+#include "ansilove.h"
#include "gd.h"
int
diff --git a/src/drawchar.c b/src/drawchar.c
@@ -11,6 +11,7 @@
#include <inttypes.h>
#include <gd.h>
+
#include "drawchar.h"
// shared method for drawing characters
diff --git a/src/error.c b/src/error.c
@@ -10,7 +10,7 @@
//
#include <stddef.h>
-#include "../include/ansilove.h"
+#include "ansilove.h"
char *
ansilove_error(struct ansilove_ctx *ctx) {
diff --git a/src/fonts.c b/src/fonts.c
@@ -9,7 +9,7 @@
// See the LICENSE file for details.
//
-#include "../include/ansilove.h"
+#include "ansilove.h"
#include "fonts.h"
void alSelectFont(struct fontStruct *fontData, int font) {
diff --git a/src/init.c b/src/init.c
@@ -10,7 +10,7 @@
//
#include <string.h>
-#include "../include/ansilove.h"
+#include "ansilove.h"
int
ansilove_init(struct ansilove_ctx *ctx, struct ansilove_options *options) {
diff --git a/src/loaders/ansi.c b/src/loaders/ansi.c
@@ -12,18 +12,18 @@
#define _XOPEN_SOURCE 700
#define _NETBSD_SOURCE
+#include <gd.h>
#include <limits.h>
#include <math.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include "../../include/ansilove.h"
-#include "../config.h"
-#include "../drawchar.h"
-#include "../fonts.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "config.h"
+#include "drawchar.h"
+#include "fonts.h"
+#include "output.h"
#ifndef HAVE_STRTONUM
#include "strtonum.h"
diff --git a/src/loaders/artworx.c b/src/loaders/artworx.c
@@ -9,12 +9,12 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stddef.h>
#include <stdint.h>
-#include "../../include/ansilove.h"
-#include "../drawchar.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "drawchar.h"
+#include "output.h"
#define ADF_HEADER_LENGTH 4289 /* 192 + 4096 + 1 */
diff --git a/src/loaders/binary.c b/src/loaders/binary.c
@@ -9,14 +9,14 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stddef.h>
#include <stdint.h>
-#include "../../include/ansilove.h"
-#include "../config.h"
-#include "../drawchar.h"
-#include "../fonts.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "config.h"
+#include "drawchar.h"
+#include "fonts.h"
+#include "output.h"
int ansilove_binary(struct ansilove_ctx *ctx, struct ansilove_options *options)
{
diff --git a/src/loaders/icedraw.c b/src/loaders/icedraw.c
@@ -9,13 +9,13 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include "../../include/ansilove.h"
-#include "../drawchar.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "drawchar.h"
+#include "output.h"
#define IDF_HEADER_LENGTH 4144 /* 4096 + 48 */
diff --git a/src/loaders/pcboard.c b/src/loaders/pcboard.c
@@ -9,14 +9,14 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stdint.h>
#include <stdlib.h>
-#include "../../include/ansilove.h"
-#include "../config.h"
-#include "../drawchar.h"
-#include "../fonts.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "config.h"
+#include "drawchar.h"
+#include "fonts.h"
+#include "output.h"
// Character structure
struct pcbChar {
diff --git a/src/loaders/tundra.c b/src/loaders/tundra.c
@@ -9,13 +9,13 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stddef.h>
#include <stdint.h>
-#include "../../include/ansilove.h"
-#include "../drawchar.h"
-#include "../fonts.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "drawchar.h"
+#include "fonts.h"
+#include "output.h"
#define TUNDRA_VERSION 24
diff --git a/src/loaders/xbin.c b/src/loaders/xbin.c
@@ -9,15 +9,15 @@
// See the LICENSE file for details.
//
+#include <gd.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include "../../include/ansilove.h"
-#include "../config.h"
-#include "../drawchar.h"
-#include "../fonts.h"
-#include "../output.h"
-#include <gd.h>
+#include "ansilove.h"
+#include "config.h"
+#include "drawchar.h"
+#include "fonts.h"
+#include "output.h"
int ansilove_xbin(struct ansilove_ctx *ctx, struct ansilove_options *options)
{
diff --git a/src/loadfile.c b/src/loadfile.c
@@ -14,7 +14,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
-#include "../include/ansilove.h"
+#include "ansilove.h"
int
ansilove_loadfile(struct ansilove_ctx *ctx, char *input) {
diff --git a/src/output.c b/src/output.c
@@ -10,8 +10,8 @@
//
#include <gd.h>
+#include "ansilove.h"
#include "output.h"
-#include "../include/ansilove.h"
int output(struct ansilove_ctx *ctx, struct ansilove_options *options, gdImagePtr im_Source) {
// XXX Error handling
diff --git a/src/savefile.c b/src/savefile.c
@@ -10,7 +10,7 @@
//
#include <stdio.h>
-#include "../include/ansilove.h"
+#include "ansilove.h"
int
ansilove_savefile(struct ansilove_ctx *ctx, char *output) {