Merge branch 'master' into ft_ssl

1 files changed, 22 insertions, 19 deletions

diff --git a/include/libft_mem.h b/include/libft_mem.h
index e03b6fa..3d7ca26 100644
--- a/include/libft_mem.h
+++ b/include/libft_mem.h
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/31 10:35:57 by cacharle          #+#    #+#             */
-/*   Updated: 2020/08/01 15:28:15 by charles          ###   ########.fr       */
+/*   Updated: 2020/08/02 10:50:39 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,28 +15,31 @@
 
 # include <stddef.h>
 # include <stdlib.h>
-# include "libft_types.h"
-
-void				ft_bzero(void *s, size_t n);
-void				*ft_memset(void *s, int c, size_t n);
-void				*ft_memcpy(void *dest, const void *src, size_t n);
-void				*ft_memccpy(void *dest, const void *src, int c, size_t n);
-void				*ft_memmove(void *dst, const void *src, size_t len);
-void				*ft_memchr(const void *s, int c, size_t n);
-int					ft_memcmp(const void *s1, const void *s2, size_t n);
-void				*ft_calloc(size_t count, size_t size);
-void				ft_memswap(void *a, void *b, size_t size);
-void				*ft_memmem(const void *big, size_t big_len,
-							const void *little, size_t little_len);
-void				ft_memset_pattern4(void *b, const void *pattern4,
-										size_t len);
-
-void				*ft_realloc(void *ptr, size_t ptr_size, size_t size);
+# include "libft_def.h"
+
+void	ft_bzero(void *s, size_t n);
+void	*ft_memset(void *s, int c, size_t n);
+void	*ft_memcpy(void *dest, const void *src, size_t n);
+void	*ft_memccpy(void *dest, const void *src, int c, size_t n);
+void	*ft_memmove(void *dst, const void *src, size_t len);
+void	*ft_memchr(const void *s, int c, size_t n);
+int		ft_memcmp(const void *s1, const void *s2, size_t n);
+void	*ft_calloc(size_t count, size_t size);
+void	ft_memswap(void *a, void *b, size_t size);
+void	ft_memset_pattern4(void *b, const void *pattern4, size_t len);
+void	*ft_memjoin(void *m1, size_t m1_size, void *m2, size_t m2_size);
+void	*ft_memjoinf1(void *m1, size_t m1_size, void *m2, size_t m2_size);
+
+void	*ft_realloc(void *ptr, size_t ptr_size, size_t size);
+
+void	*ft_memmem(
+			const void *big, size_t big_len,
+			const void *little, size_t little_len);
 
 /*
 ** bloat ?
 */
 
-void				ft_memdel(void **ap);
+void	ft_memdel(void **ap);
 
 #endif