From 6af3df4973756d3db79646a4c454d6b3de735b21 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Thu, 8 Feb 2024 17:08:24 +0100 Subject: [PATCH] fix printf include --- Makefile | 9 +++++++-- libft.h | 12 +++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8003682..fe010d5 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2024/02/04 15:15:14 by adjoly ### ########.fr # +# Updated: 2024/02/08 16:49:00 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -62,6 +62,11 @@ SRCS = is/ft_isalnum.c \ str/ft_substr.c \ str/ft_tolower.c \ str/ft_toupper.c \ + print/printf/ft_printf.c \ + print/printf/ft_putchar.c \ + print/printf/ft_putnbrbase.c \ + print/printf/ft_putnbr.c \ + print/printf/ft_putstr.c \ OBJS = $(SRCS:.c=.o) @@ -75,7 +80,7 @@ LIB = print/printf/libftprintf.a \ $(NAME): $(OBJS) make -C io/get_next_line/ make -C print/printf/ - ar -rcs $(NAME) $(OBJS) + ar -rcs $(NAME) $(OBJS) $(LIB) %.o: %.c $(CC) $(FLAGS) -I $(HEADERS) $< -c -o $@ diff --git a/libft.h b/libft.h index 0652da8..c8189c4 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 10:06:03 by adjoly #+# #+# */ -/* Updated: 2024/02/04 15:12:48 by adjoly ### ########.fr */ +/* Updated: 2024/02/08 16:50:59 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -79,4 +79,14 @@ void ft_putnbrbase_fd(int n, char *base, int fd); void ft_putnbrbase(int n, char *base); void ft_putnbr(int n); +int ft_printf(const char *format, ...); +int ft_printconversion(char conversion, va_list args); +int ft_putnbrulong(unsigned int n); +int ft_putaddr(void *ptr); +int ft_putstr_p(char *s); +int ft_putnbrbase_p(unsigned long int n, char *base); +int ft_putnbrbase_pf(unsigned int n, char *base); +int ft_putchar_p(char c); +int ft_putnbr_p(int n); +size_t ft_strlen(const char *s); #endif