procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/haiku_support.cc (gui_abort): Get rid of extern "C" declarations.

Browse source
This commit is contained in:
Po Lu 2022-04-21 12:41:09 +00:00
parent fa9580d13b
commit 6a50ce949b
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/haiku_support.cc
View file

@ -173,7 +173,7 @@ static bool drag_and_drop_in_progress;
Rectifying that problem is simple: all code in a looper callback
must lock the child frame data with this macro instead.
IOW, If some other code is already running with the child frame
IOW, if some other code is already running with the child frame
lock held, don't interfere: wait until it's finished before
continuing. */
#define CHILD_FRAME_LOCK_INSIDE_LOOPER_CALLBACK \
@ -189,13 +189,7 @@ static bool drag_and_drop_in_progress;
port, so it's probably here to stay. */
extern status_t get_subpixel_antialiasing (bool *);
extern "C"
{
extern _Noreturn void emacs_abort (void);
/* Also defined in haikuterm.h. */
extern void be_app_quit (void);
}
/* The ID of the thread the BApplication is running in. */
static thread_id app_thread;
_Noreturn void
@ -205,7 +199,7 @@ gui_abort (const char *msg)
fprintf (stderr, "Under Haiku, Emacs cannot recover from errors in GUI code\n");
fprintf (stderr, "App Server disconnects usually manifest as bitmap "
"initialization failures or lock failures.");
emacs_abort ();
abort ();
}
struct be_popup_menu_data