From a07e2d6f01a534160c08263d5147dc07a95e99ba Mon Sep 17 00:00:00 2001
From: mykola2312 <49044616+mykola2312@users.noreply.github.com>
Date: Tue, 17 May 2022 02:14:28 +0300
Subject: [PATCH] update ifndef-define statements in every header with CUTIL_
 prefix that already included files with matching defines will not collide

---
 array.h   | 4 ++--
 bitmap.h  | 4 ++--
 cutypes.h | 4 ++--
 endian.h  | 4 ++--
 list.h    | 4 ++--
 string.h  | 4 ++++
 struct.h  | 4 ++--
 va_list.h | 4 ++--
 8 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 string.h

diff --git a/array.h b/array.h
index 1a7870a..08db5e8 100644
--- a/array.h
+++ b/array.h
@@ -1,5 +1,5 @@
-#ifndef __ARRAY_H
-#define __ARRAY_H
+#ifndef __CUTIL_ARRAY_H
+#define __CUTIL_ARRAY_H
 
 #include "cutypes.h"
 
diff --git a/bitmap.h b/bitmap.h
index c851151..c57cd7d 100644
--- a/bitmap.h
+++ b/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef __BITMAP_H
-#define __BITMAP_H
+#ifndef __CUTIL_BITMAP_H
+#define __CUTIL_BITMAP_H
 
 #include "cutypes.h"
 
diff --git a/cutypes.h b/cutypes.h
index 94be2a7..0be0431 100644
--- a/cutypes.h
+++ b/cutypes.h
@@ -1,5 +1,5 @@
-#ifndef __CUTYPES_H
-#define __CUTYPES_H
+#ifndef __CUTIL_TYPES_H
+#define __CUTIL_TYPES_H
 
 #define ARCH_UNKNOWN    0
 #define x86_64          1
diff --git a/endian.h b/endian.h
index ee23a77..8d4ed86 100644
--- a/endian.h
+++ b/endian.h
@@ -1,5 +1,5 @@
-#ifndef __ENDIAN_H
-#define __ENDIAN_H
+#ifndef __CUTIL_ENDIAN_H
+#define __CUTIL_ENDIAN_H
 
 #include "cutypes.h"
 
diff --git a/list.h b/list.h
index c95c596..8d2ec22 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,5 @@
-#ifndef __LIST_H
-#define __LIST_H
+#ifndef __CUTIL_LIST_H
+#define __CUTIL_LIST_H
 
 #include "cutypes.h"
 
diff --git a/string.h b/string.h
new file mode 100644
index 0000000..17fcac6
--- /dev/null
+++ b/string.h
@@ -0,0 +1,4 @@
+#ifndef __CUTIL_STRING_H
+#define __CUTIL_STRING_H
+
+#endif
\ No newline at end of file
diff --git a/struct.h b/struct.h
index d025605..c01bbfc 100644
--- a/struct.h
+++ b/struct.h
@@ -1,5 +1,5 @@
-#ifndef __STRUCT_H
-#define __STRUCT_H
+#ifndef __CUTIL_STRUCT_H
+#define __CUTIL_STRUCT_H
 
 #include "cutypes.h"
 #include "endian.h"
diff --git a/va_list.h b/va_list.h
index a5c1db1..23a1249 100644
--- a/va_list.h
+++ b/va_list.h
@@ -1,5 +1,5 @@
-#ifndef __VA_LIST_H
-#define __VA_LIST_H
+#ifndef __CUTIL_VA_LIST_H
+#define __CUTIL_VA_LIST_H
 
 #include "cutypes.h"