58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
--- a/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
|
|
|
|
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 = &&
|
|
|
|
diff --git a/a.out b/a.out
|
|
deleted file mode 100755
|
|
--- 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>
|