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.

18 files changed, 8 insertions, 12 deletions

diff --git a/src/nvim/digraph.h b/src/nvim/digraph.h
index 039fc3370d..71330ae9b1 100644
--- a/src/nvim/digraph.h
+++ b/src/nvim/digraph.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_DIGRAPH_H
 #define NVIM_DIGRAPH_H
 
-#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/types.h"
 
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index fa02b1ea0f..7dbd18737a 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -3,7 +3,6 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/channel.h"
-#include "nvim/eval/funcs.h"  // For FunPtr
 #include "nvim/event/time.h"  // For TimeWatcher
 #include "nvim/ex_cmds_defs.h"  // For exarg_T
 #include "nvim/os/fileio.h"  // For FileDescriptor
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
diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h
index 7e0d3016bc..ddb25c53e4 100644
--- a/src/nvim/ex_docmd.h
+++ b/src/nvim/ex_docmd.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_EX_DOCMD_H
 #define NVIM_EX_DOCMD_H
 
-#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/globals.h"
 
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 4c26cfe500..f715364d6f 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -24,6 +24,7 @@
 #include "nvim/digraph.h"
 #include "nvim/edit.h"
 #include "nvim/eval.h"
+#include "nvim/eval/funcs.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/event/loop.h"
 #include "nvim/ex_cmds.h"
diff --git a/src/nvim/insexpand.h b/src/nvim/insexpand.h
index def7f49078..8e183455ca 100644
--- a/src/nvim/insexpand.h
+++ b/src/nvim/insexpand.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_INSEXPAND_H
 #define NVIM_INSEXPAND_H
 
-#include "nvim/eval/funcs.h"
 #include "nvim/vim.h"
 
 /// state for pum_ext_select_item.
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index fcbf36c711..824b9a8ec0 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -15,6 +15,7 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/change.h"
 #include "nvim/cursor.h"
+#include "nvim/eval/funcs.h"
 #include "nvim/eval/typval.h"
 #include "nvim/eval/userfunc.h"
 #include "nvim/event/loop.h"
diff --git a/src/nvim/mapping.h b/src/nvim/mapping.h
index 4b0622ffa1..b19131a686 100644
--- a/src/nvim/mapping.h
+++ b/src/nvim/mapping.h
@@ -2,7 +2,6 @@
 #define NVIM_MAPPING_H
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/types.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/match.c b/src/nvim/match.c
index e17a95569c..8c72b13bc2 100644
--- a/src/nvim/match.c
+++ b/src/nvim/match.c
@@ -7,6 +7,7 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/charset.h"
+#include "nvim/eval/funcs.h"
 #include "nvim/fold.h"
 #include "nvim/highlight_group.h"
 #include "nvim/match.h"
diff --git a/src/nvim/match.h b/src/nvim/match.h
index fdcec0ae05..22a848bfdf 100644
--- a/src/nvim/match.h
+++ b/src/nvim/match.h
@@ -2,7 +2,6 @@
 #define NVIM_MATCH_H
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/search.c b/src/nvim/search.c
index e1a5d0214e..e091d2ad09 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -18,6 +18,7 @@
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
 #include "nvim/eval.h"
+#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_getln.h"
diff --git a/src/nvim/search.h b/src/nvim/search.h
index 53059cc1ea..ff843bb59e 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/funcs.h"
 #include "nvim/eval/typval.h"
 #include "nvim/normal.h"
 #include "nvim/os/time.h"
diff --git a/src/nvim/sign.c b/src/nvim/sign.c
index 9a4b304d6c..1640d0167e 100644
--- a/src/nvim/sign.c
+++ b/src/nvim/sign.c
@@ -10,6 +10,7 @@
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
+#include "nvim/eval/funcs.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/fold.h"
 #include "nvim/highlight_group.h"
diff --git a/src/nvim/sign.h b/src/nvim/sign.h
index c61e5d20ef..ba84cd71a4 100644
--- a/src/nvim/sign.h
+++ b/src/nvim/sign.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "nvim/buffer_defs.h"
-#include "nvim/eval/funcs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/sign_defs.h"
 
diff --git a/src/nvim/testing.h b/src/nvim/testing.h
index 1522ebc7b7..69596d725c 100644
--- a/src/nvim/testing.h
+++ b/src/nvim/testing.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_TESTING_H
 #define NVIM_TESTING_H
 
-#include "nvim/eval/funcs.h"
 #include "nvim/eval/typval.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/types.h b/src/nvim/types.h
index 73cd2204d6..00b9e6fc09 100644
--- a/src/nvim/types.h
+++ b/src/nvim/types.h
@@ -22,6 +22,8 @@ typedef int handle_T;
 // absent callback etc.
 typedef int LuaRef;
 
+typedef void (*FunPtr)(void);
+
 typedef handle_T NS;
 
 typedef struct expand expand_T;