From f5c5a80fb7c780265360edd1f9b1e34a78d978c3 Mon Sep 17 00:00:00 2001 From: gazhonsepaskwa Date: Fri, 17 Jan 2025 12:47:08 +0100 Subject: [PATCH] avoiding conflict --- lib/libft/srcs/format/ft_split.c | 4 ++-- lib/libft/srcs/format/ft_split_utils.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libft/srcs/format/ft_split.c b/lib/libft/srcs/format/ft_split.c index e31a914..50163a1 100644 --- a/lib/libft/srcs/format/ft_split.c +++ b/lib/libft/srcs/format/ft_split.c @@ -33,8 +33,8 @@ static int count_strings(char const *s, char *set) count = 0; while (*s) { - if (!is_charset(*s, set) && is_charset(*(s + 1), set) - || *(s + 1) == '\0') + if (!is_charset(*s, set) && ( is_charset(*(s + 1), set) + || *(s + 1) == '\0')) count ++; s++; } diff --git a/lib/libft/srcs/format/ft_split_utils.c b/lib/libft/srcs/format/ft_split_utils.c index e83f3f8..49137bc 100644 --- a/lib/libft/srcs/format/ft_split_utils.c +++ b/lib/libft/srcs/format/ft_split_utils.c @@ -1,4 +1,4 @@ -#include "lib/libft/libft.h" +#include "../../libft.h" int is_charset(char c, char *set) {