From 60348ab458561afb26409e1d83fe0067d806f046 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 3 Mar 2021 16:34:44 +0900
Subject: [PATCH] [headers] Fix some inconsistent include guards

---
 include/QF/cexpr.h  | 6 +++---
 include/QF/cmem.h   | 6 +++---
 include/QF/darray.h | 8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/QF/cexpr.h b/include/QF/cexpr.h
index 4e2dd3bcb..9a79690a6 100644
--- a/include/QF/cexpr.h
+++ b/include/QF/cexpr.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __expr_h
-#define __expr_h
+#ifndef __QF_expr_h
+#define __QF_expr_h
 
 #include <stdlib.h>
 
@@ -140,4 +140,4 @@ extern exprtype_t cexpr_plitem;
 extern binop_t cexpr_struct_binops[];
 extern binop_t cexpr_struct_pointer_binops[];
 
-#endif
+#endif//__QF_expr_h
diff --git a/include/QF/cmem.h b/include/QF/cmem.h
index 5f0d733ea..f9c47d4c1 100644
--- a/include/QF/cmem.h
+++ b/include/QF/cmem.h
@@ -24,8 +24,8 @@
 		Boston, MA  02111-1307, USA
 
 */
-#ifndef __cmem_h
-#define __cmem_h
+#ifndef __QF_cmem_h
+#define __QF_cmem_h
 
 #include "QF/qtypes.h"
 
@@ -115,4 +115,4 @@ void delete_memsuper (memsuper_t *super);
 void *cmemalloc (memsuper_t *super, size_t size);
 void cmemfree (memsuper_t *super, void *mem);
 
-#endif//__cmem_h
+#endif//__QF_cmem_h
diff --git a/include/QF/darray.h b/include/QF/darray.h
index 50dc6c348..c2e21d7e1 100644
--- a/include/QF/darray.h
+++ b/include/QF/darray.h
@@ -28,8 +28,10 @@
 
 */
 
-#ifndef __darray_h
-#define __darray_h
+#ifndef __QF_darray_h
+#define __QF_darray_h
+
+#include "QF/sys.h"
 
 /** \defgroup darray Dynamic Arrays
 	\ingroup utils
@@ -363,4 +365,4 @@
 
 ///@}
 
-#endif//__darray_h
+#endif//__QF_darray_h