From ccf4a4fa482f61938a9495c862b74f4a2d3ade0c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Mar 2022 12:35:04 -0700
Subject: [PATCH] Port to gcc -D EMACS_EXTERN_INLINE

* src/comp.h, src/thread.h: Add INLINE_HEADER_BEGIN and
INLINE_HEADER_END, since it uses INLINE.
* src/emacs.c: Include these two files.
---
 src/comp.h   | 4 ++++
 src/emacs.c  | 4 ++++
 src/thread.h | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/src/comp.h b/src/comp.h
index 40f1e9b979c..da53f32971e 100644
--- a/src/comp.h
+++ b/src/comp.h
@@ -53,6 +53,8 @@ struct Lisp_Native_Comp_Unit
 
 #ifdef HAVE_NATIVE_COMP
 
+INLINE_HEADER_BEGIN
+
 INLINE bool
 NATIVE_COMP_UNITP (Lisp_Object a)
 {
@@ -99,6 +101,8 @@ void unload_comp_unit (struct Lisp_Native_Comp_Unit *cu)
 
 extern void syms_of_comp (void);
 
+INLINE_HEADER_END
+
 #endif /* #ifdef HAVE_NATIVE_COMP */
 
 #endif /* #ifndef COMP_H */
diff --git a/src/emacs.c b/src/emacs.c
index d1060bca0b3..0ff916b18b8 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -140,6 +140,10 @@ extern char etext;
 #include "fingerprint.h"
 #include "epaths.h"
 
+/* Include these only because of INLINE.  */
+#include "comp.h"
+#include "thread.h"
+
 static const char emacs_version[] = PACKAGE_VERSION;
 static const char emacs_copyright[] = COPYRIGHT;
 static const char emacs_bugreport[] = PACKAGE_BUGREPORT;
diff --git a/src/thread.h b/src/thread.h
index ddba1a2d994..b34ca3d57c8 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -33,6 +33,8 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "sysselect.h"		/* FIXME */
 #include "systhread.h"
 
+INLINE_HEADER_BEGIN
+
 /* Byte-code interpreter thread state.  */
 struct bc_thread_state {
   struct bc_frame *fp;   /* current frame pointer */
@@ -194,6 +196,8 @@ struct thread_state
   struct bc_thread_state bc;
 } GCALIGNED_STRUCT;
 
+INLINE_HEADER_BEGIN
+
 INLINE bool
 THREADP (Lisp_Object a)
 {
@@ -315,4 +319,6 @@ int thread_select  (select_func *func, int max_fds, fd_set *rfds,
 
 bool thread_check_current_buffer (struct buffer *);
 
+INLINE_HEADER_END
+
 #endif /* THREAD_H */
-- 
2.39.2