From 25ec735d0cc9991cb301089828e6e57391108865 Mon Sep 17 00:00:00 2001 From: maix0 Date: Fri, 13 Sep 2024 15:34:42 +0000 Subject: [PATCH] update: fixed normed on more stuff --- allocator/include/aq/internal_vg_funcs.h | 16 ++++++++++++++-- line/src/line_globals.c | 6 +----- line/src/line_no_tty.c | 4 ++-- stdme/vendor/mlx.h | 6 +++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/allocator/include/aq/internal_vg_funcs.h b/allocator/include/aq/internal_vg_funcs.h index 0e9e4513..94652b0f 100644 --- a/allocator/include/aq/internal_vg_funcs.h +++ b/allocator/include/aq/internal_vg_funcs.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/12 22:20:30 by maiboyer #+# #+# */ -/* Updated: 2024/07/10 16:40:57 by maiboyer ### ########.fr */ +/* Updated: 2024/09/13 15:32:52 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,19 @@ # include "me/types.h" -# if !defined(NVALGRIND) || defined(VGHEADER) +# ifndef NVALGRIND +# if _INCLUDE_VALGRIND +# define _INCLUDE_VALGRIND +# endif +# endif + +# ifdef VGHEADER +# if _INCLUDE_VALGRIND +# define _INCLUDE_VALGRIND +# endif +# endif + +# ifdef _INCLUDE_VALGRIND # ifdef NVALGRIND # undef NVALGRIND # endif diff --git a/line/src/line_globals.c b/line/src/line_globals.c index 3432e4a1..8e79eaa3 100644 --- a/line/src/line_globals.c +++ b/line/src/line_globals.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/10 15:47:12 by maiboyer #+# #+# */ -/* Updated: 2024/09/02 17:44:16 by rparodi ### ########.fr */ +/* Updated: 2024/09/13 15:31:02 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,10 +15,6 @@ #include "line/_line_structs.h" #include "me/mem/mem.h" -#ifdef static -# undef static -#endif - t_const_str get_unfinished_str(void) { return ("If you see this," diff --git a/line/src/line_no_tty.c b/line/src/line_no_tty.c index 2374433f..6fdac875 100644 --- a/line/src/line_no_tty.c +++ b/line/src/line_no_tty.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/11 18:10:24 by maiboyer #+# #+# */ -/* Updated: 2024/07/30 17:14:18 by rparodi ### ########.fr */ +/* Updated: 2024/09/13 15:30:46 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,7 +32,7 @@ bool line_no_tty_impl(t_str *out) chr = '\n'; if (read_fd(get_stdin(), (t_u8 *)&chr, 1, &ret)) return (string_free(line), *out = NULL, true); - if (ret == 0) + if (ret == 0) { if (line.len == 0) return (string_free(line), *out = NULL, true); diff --git a/stdme/vendor/mlx.h b/stdme/vendor/mlx.h index bdacfe6f..f89dbd0d 100644 --- a/stdme/vendor/mlx.h +++ b/stdme/vendor/mlx.h @@ -6,7 +6,7 @@ /* By: ol +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2000/08/01 16:37:50 by ol #+# #+# */ -/* Updated: 2024/08/01 06:44:00 by maiboyer ### ########.fr */ +/* Updated: 2024/09/13 15:34:18 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -133,8 +133,8 @@ int mlx_destroy_display(void *mlx_ptr); ** can be hooked. Some macro and defines from X11/X.h are needed here. */ -int mlx_hook(void *win_ptr, int x_event, int x_mask, int (*funct)(), - void *param); +int mlx_hook(void *win_ptr, int x_event, int x_mask, ...); +// void *param); int mlx_do_key_autorepeatoff(void *mlx_ptr); int mlx_do_key_autorepeaton(void *mlx_ptr);