diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /src/pdumper.h | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'src/pdumper.h')
| -rw-r--r-- | src/pdumper.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/pdumper.h b/src/pdumper.h index ed665ac6c2f..deec9af046d 100644 --- a/src/pdumper.h +++ b/src/pdumper.h @@ -81,6 +81,7 @@ pdumper_remember_lv_ptr_raw (void *ptr, enum Lisp_Type type) typedef void (*pdumper_hook)(void); extern void pdumper_do_now_and_after_load_impl (pdumper_hook hook); +extern void pdumper_do_now_and_after_late_load_impl (pdumper_hook hook); INLINE void pdumper_do_now_and_after_load (pdumper_hook hook) @@ -92,6 +93,18 @@ pdumper_do_now_and_after_load (pdumper_hook hook) #endif } +/* Same as 'pdumper_do_now_and_after_load' but for hooks running code + that can call into Lisp. */ +INLINE void +pdumper_do_now_and_after_late_load (pdumper_hook hook) +{ +#ifdef HAVE_PDUMPER + pdumper_do_now_and_after_late_load_impl (hook); +#else + hook (); +#endif +} + /* Macros useful in pdumper callback functions. Assign a value if we're loading a dump and the value needs to be reset to its original value, and if we're initializing for the first time, @@ -127,7 +140,7 @@ enum pdumper_load_result PDUMPER_LOAD_ERROR /* Must be last, as errno may be added. */ }; -int pdumper_load (const char *dump_filename); +int pdumper_load (const char *dump_filename, char *argv0); struct pdumper_loaded_dump { |