summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Maddela <e7appew@gmail.com>2018-01-08 09:56:27 +1100
committerCarlos Maddela <e7appew@gmail.com>2018-12-29 12:17:20 +0000
commit7607e6f2f5ca15a14ea1fedc0fb8ed12879b0e94 (patch)
treef0f2d58a5038eb99007e2ee7fb638c7df56e419f
parent98879aa665bd2f5aecb5d42a0d6770461150c613 (diff)
Fix conflicting definitions of ncurses' WINDOW
Description: Fix conflicting definitions of ncurses' WINDOW by ensuring headers are included in a consistent order, i.e. that config.h or hexedit.h is included first. Author: Carlos Maddela <e7appew@gmail.com> Bug-Debian: https://bugs.debian.org/701670 Last-Update: 2018-01-08 Gbp-Pq: Name fix_conflicting_definitions.patch
-rw-r--r--src/edit.c2
-rw-r--r--src/undo.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c
index 4f597c6..42cb022 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -12,8 +12,8 @@
*/
-#include <assert.h>
#include "hexedit.h"
+#include <assert.h>
/* The routines in this file are very messy and ugly and not much thought
* went into thinking how to minimize the amount of code, I only did it
diff --git a/src/undo.c b/src/undo.c
index a1b4f02..030cc47 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -12,8 +12,8 @@
*/
-#include <assert.h>
#include "hexedit.h"
+#include <assert.h>
void