9 files changed, 27 insertions, 55 deletions
diff --git a/include/ft_get_next_line.h b/include/ft_get_next_line.h
deleted file mode 100644
index 03bf344..0000000
--- a/include/ft_get_next_line.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   get_next_line.h                                    :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/09 13:52:59 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/17 10:53:43 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifndef FT_GET_NEXT_LINE_H
-# define FT_GET_NEXT_LINE_H
-
-# include <unistd.h>
-# include <stdlib.h>
-# include <limits.h>
-# include "libft.h"
-
-# ifndef GNL_BUFFER_SIZE
-#  define GNL_BUFFER_SIZE 32
-# endif
-
-# define GNL_STATUS_LINE 1
-# define GNL_STATUS_EOF 0
-# define GNL_STATUS_ERROR -1
-
-/*
-** get_next_line.c
-*/
-
-int		get_next_line(int fd, char **line);
-
-#endif
diff --git a/include/libft.h b/include/libft.h
index 0b4d608..898c7d9 100644
--- a/include/libft.h
+++ b/include/libft.h
@@ -20,30 +20,15 @@
 # include <limits.h>
 # include <errno.h>
 
-# include "ft_types.h"
-# include "ft_ctype.h"
-# include "ft_io.h"
-# include "ft_mem.h"
-# include "ft_str.h"
-
-# ifdef FT_FEATURES_FT_LST
-#  include "ft_lst.h"
-# endif
-
-# ifdef FT_FEATURES_FT_GET_NEXT_LINE
-#  include "ft_get_next_line.h"
-# endif
-
-# ifdef FT_FEATURES_FT_PRINTF
-#  include "ft_printf.h"
-# endif
+# include "libft_types.h"
+# include "libft_ctype.h"
+# include "libft_io.h"
+# include "libft_mem.h"
+# include "libft_str.h"
 
 # ifdef __linux__
 #  include <stdio.h>
 #  define OPEN_MAX FOPEN_MAX
 # endif
 
-# define TRUE 1
-# define FALSE 0
-
 #endif
diff --git a/include/ft_ctype.h b/include/libft_ctype.h
index 44e88b8..44e88b8 100644
--- a/include/ft_ctype.h
+++ b/include/libft_ctype.h
diff --git a/include/ft_io.h b/include/libft_io.h
index 8c633fb..f4c223b 100644
--- a/include/ft_io.h
+++ b/include/libft_io.h
@@ -13,6 +13,11 @@
 #ifndef FT_IO_H
 # define FT_IO_H
 
+# include <unistd.h>
+# include <stdlib.h>
+# include <limits.h>
+# include "libft.h"
+
 void	ft_putendl(char *s);
 void	ft_putchar(char c);
 void	ft_putstr(char const *s);
@@ -22,4 +27,18 @@ void	ft_putstr_fd(char *s, int fd);
 void	ft_putendl_fd(char *s, int fd);
 void	ft_putnbr_fd(int n, int fd);
 
+# ifndef FTNL_BUFFER_SIZE
+#  define FTNL_BUFFER_SIZE 32
+# endif
+
+# define FTNL_STATUS_LINE 1
+# define FTNL_STATUS_EOF 0
+# define FTNL_STATUS_ERROR -1
+
+/*
+** get_next_line.c
+*/
+
+int		ft_next_line(int fd, char **line);
+
 #endif
diff --git a/include/ft_lst.h b/include/libft_lst.h
index 23fb192..23fb192 100644
--- a/include/ft_lst.h
+++ b/include/libft_lst.h
diff --git a/include/ft_mem.h b/include/libft_mem.h
index d1e47f6..d1e47f6 100644
--- a/include/ft_mem.h
+++ b/include/libft_mem.h
diff --git a/include/ft_printf.h b/include/libft_printf.h
index 615039b..615039b 100644
--- a/include/ft_printf.h
+++ b/include/libft_printf.h
diff --git a/include/ft_str.h b/include/libft_str.h
index 105da79..105da79 100644
--- a/include/ft_str.h
+++ b/include/libft_str.h
diff --git a/include/ft_types.h b/include/libft_types.h
index b465382..04c9f02 100644
--- a/include/ft_types.h
+++ b/include/libft_types.h
@@ -13,6 +13,9 @@
 #ifndef FT_TYPES_H
 # define FT_TYPES_H
 
+# define TRUE 1
+# define FALSE 0
+
 typedef unsigned char		t_ftbyte;
 typedef int					t_ftbool;
 typedef unsigned int		t_ftsize;