2021-10-29 20:09:51

This commit is contained in:
gbaconni
2021-10-29 20:09:51 +02:00
parent e42f5bd8cf
commit dc854959a4
3 changed files with 46 additions and 11 deletions

View File

@@ -1,14 +1,5 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -6,7 +6,7 @@
# By: ysoroko <ysoroko@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/11/28 19:44:45 by ysoroko #+# #+# #
-# Updated: 2021/01/18 12:37:32 by ysoroko ### ########.fr #
+# Updated: 2021/10/29 17:46:51 by gbaconni ### ########.fr #
# #
# **************************************************************************** #
@@ -14,13 +14,14 @@ CC = gcc @@ -14,13 +14,14 @@ CC = gcc
CFLAGS = -Wall -Wextra -Werror CFLAGS = -Wall -Wextra -Werror
@@ -25,8 +16,6 @@
AND = && AND = &&
diff --git a/a.out b/a.out
deleted file mode 100755
--- a/ft.h --- a/ft.h
+++ b/ft.h +++ b/ft.h
@@ -13,15 +13,24 @@ @@ -13,15 +13,24 @@

18
libft/t1 Normal file
View File

@@ -0,0 +1,18 @@
--- a/Makefile
+++ b/Makefile
@@ -14,13 +14,14 @@ CC = gcc
CFLAGS = -Wall -Wextra -Werror
-SRC = ../*.c \
+SRC = \
ft_compare_results.c \
ft_mem_count.c \
ft_my_split.c \
ft_print.c \
ft_run_test.c \
main.c \
+ -L../libft -I../libft -lft
AND = &&

28
libft/t2 Normal file
View File

@@ -0,0 +1,28 @@
--- a/ft.h
+++ b/ft.h
@@ -13,15 +13,24 @@
#ifndef FT_H
# define FT_H
+#include <ctype.h>
+
//for MacOS, MALLOC_SIZE_FUNCTION Macro should be malloc_size
//for Windows, MALLOC_SIZE_FUNCTION Macro should be _msize
//for GLIBC systems, MALLOC_SIZE_FUNCTION Macro should be malloc_usable_size
+#ifdef __GNU_LIBRARY__
+#define MALLOC_SIZE_FUNCTION malloc_usable_size
+#else
#define MALLOC_SIZE_FUNCTION malloc_size
+#endif
//For Windows/GLIBC next #include should be "#include <malloc/malloc.h>"
//For MacOs next #include should be #include <malloc.h>
+#ifdef __GNU_LIBRARY__
+#include <malloc.h>
+#else
#include <malloc/malloc.h>
-
+#endif
//Includes
#include <stdio.h>