From a7b9920930f032419439f52ca529abcffc0d15b1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 22 Jul 2022 22:05:02 +0800 Subject: refactor: move FunPtr to types.h (#19466) This type itself is not eval-specific. Moving it to types.h can avoid including eval/funcs.h in many headers, and types.h is already included by many headers. --- src/nvim/eval/funcs.h | 2 -- src/nvim/eval/userfunc.c | 1 + src/nvim/eval/vars.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nvim/eval') diff --git a/src/nvim/eval/funcs.h b/src/nvim/eval/funcs.h index 5f8d81c989..583ee0e75e 100644 --- a/src/nvim/eval/funcs.h +++ b/src/nvim/eval/funcs.h @@ -4,8 +4,6 @@ #include "nvim/buffer_defs.h" #include "nvim/eval/typval.h" -typedef void (*FunPtr)(void); - /// Prototype of C function that implements VimL function typedef void (*VimLFunc)(typval_T *args, typval_T *rvar, FunPtr data); diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index b01415f052..7283fb3cec 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -9,6 +9,7 @@ #include "nvim/edit.h" #include "nvim/eval.h" #include "nvim/eval/encode.h" +#include "nvim/eval/funcs.h" #include "nvim/eval/userfunc.h" #include "nvim/eval/vars.h" #include "nvim/ex_cmds2.h" diff --git a/src/nvim/eval/vars.h b/src/nvim/eval/vars.h index 4eea37d404..73efc4938a 100644 --- a/src/nvim/eval/vars.h +++ b/src/nvim/eval/vars.h @@ -1,7 +1,6 @@ #ifndef NVIM_EVAL_VARS_H #define NVIM_EVAL_VARS_H -#include "nvim/eval/funcs.h" // For FunPtr #include "nvim/ex_cmds_defs.h" // For exarg_T #ifdef INCLUDE_GENERATED_DECLARATIONS -- cgit