From 9b77c60740a317e9bfb0f1431f7b11fe522da824 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 9 Jan 2024 12:40:59 -0500
Subject: [PATCH] Rename string.h to strutil.h to avoid conflict

---
 Makefile                    | 2 +-
 src/config.c                | 2 +-
 src/keyd.h                  | 2 +-
 src/{string.c => strutil.c} | 2 +-
 src/{string.h => strutil.h} | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{string.c => strutil.c} (98%)
 rename src/{string.h => strutil.h} (88%)

diff --git a/Makefile b/Makefile
index 3ae12761..70dae0de 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ test-io:
 	-o bin/test-io \
 		t/test-io.c \
 		src/keyboard.c \
-		src/string.c \
+		src/strutil.c \
 		src/macro.c \
 		src/config.c \
 		src/log.c \
diff --git a/src/config.c b/src/config.c
index d3b301ce..28f8a6ea 100644
--- a/src/config.c
+++ b/src/config.c
@@ -21,7 +21,7 @@
 #include "ini.h"
 #include "keys.h"
 #include "log.h"
-#include "string.h"
+#include "strutil.h"
 #include "unicode.h"
 
 #define MAX_FILE_SZ 65536
diff --git a/src/keyd.h b/src/keyd.h
index 63189390..08abdfc6 100644
--- a/src/keyd.h
+++ b/src/keyd.h
@@ -44,7 +44,7 @@
 #include "keyboard.h"
 #include "keys.h"
 #include "vkbd.h"
-#include "string.h"
+#include "strutil.h"
 
 #define MAX_IPC_MESSAGE_SIZE 4096
 
diff --git a/src/string.c b/src/strutil.c
similarity index 98%
rename from src/string.c
rename to src/strutil.c
index dfcdc609..4cdb6412 100644
--- a/src/string.c
+++ b/src/strutil.c
@@ -5,7 +5,7 @@
  */
 #include <assert.h>
 
-#include "string.h"
+#include "strutil.h"
 
 int utf8_read_char(const char *_s, uint32_t *code)
 {
diff --git a/src/string.h b/src/strutil.h
similarity index 88%
rename from src/string.h
rename to src/strutil.h
index 3e374ccc..eb6ea46f 100644
--- a/src/string.h
+++ b/src/strutil.h
@@ -3,8 +3,8 @@
  *
  * © 2019 Raheman Vaiya (see also: LICENSE).
  */
-#ifndef STRING_H
-#define STRING_H
+#ifndef STRUTIL_H
+#define STRUTIL_H
 
 #include <stdint.h>
 #include <stdlib.h>