Skip to content

Commit

Permalink
Rename string.h to strutil.h to avoid conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rhansen committed Dec 18, 2024
1 parent de9d715 commit 9b77c60
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/keyd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/string.c → src/strutil.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#include <assert.h>

#include "string.h"
#include "strutil.h"

int utf8_read_char(const char *_s, uint32_t *code)
{
Expand Down
4 changes: 2 additions & 2 deletions src/string.h → src/strutil.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 9b77c60

Please sign in to comment.