From: Daniel Colascione <dancol@dancol.org>
Date: Thu, 15 Feb 2018 22:17:38 +0000 (-0800)
Subject: Avoid INLINE for static functions
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3dd8f8495250de39af0d8fdba9e3b07169680b3d;p=emacs.git

Avoid INLINE for static functions
---

diff --git a/src/alloc.c b/src/alloc.c
index 0070b465f3a..90f913da36f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -374,32 +374,32 @@ extern Lisp_Object which_symbols (Lisp_Object, EMACS_INT) EXTERNALLY_VISIBLE;
 /* Forward declare mark accessor functions: they're used all over the
    place.  */
 
-INLINE static bool vector_marked_p (const struct Lisp_Vector *v);
-INLINE static void set_vector_marked (struct Lisp_Vector *v);
+inline static bool vector_marked_p (const struct Lisp_Vector *v);
+inline static void set_vector_marked (struct Lisp_Vector *v);
 
-INLINE static bool vectorlike_marked_p (const union vectorlike_header *v);
-INLINE static void set_vectorlike_marked (union vectorlike_header *v);
+inline static bool vectorlike_marked_p (const union vectorlike_header *v);
+inline static void set_vectorlike_marked (union vectorlike_header *v);
 
-INLINE static bool cons_marked_p (const struct Lisp_Cons *c);
-INLINE static void set_cons_marked (struct Lisp_Cons *c);
+inline static bool cons_marked_p (const struct Lisp_Cons *c);
+inline static void set_cons_marked (struct Lisp_Cons *c);
 
-INLINE static bool string_marked_p (const struct Lisp_String *s);
-INLINE static void set_string_marked (struct Lisp_String *s);
+inline static bool string_marked_p (const struct Lisp_String *s);
+inline static void set_string_marked (struct Lisp_String *s);
 
-INLINE static bool symbol_marked_p (const struct Lisp_Symbol *s);
-INLINE static void set_symbol_marked (struct Lisp_Symbol *s);
+inline static bool symbol_marked_p (const struct Lisp_Symbol *s);
+inline static void set_symbol_marked (struct Lisp_Symbol *s);
 
-INLINE static bool misc_any_marked_p (const struct Lisp_Misc_Any *m);
-INLINE static void set_misc_any_marked (struct Lisp_Misc_Any *m);
+inline static bool misc_any_marked_p (const struct Lisp_Misc_Any *m);
+inline static void set_misc_any_marked (struct Lisp_Misc_Any *m);
 
-INLINE static bool marker_marked_p (const struct Lisp_Marker *m);
-INLINE static void set_marker_marked (struct Lisp_Marker *m);
+inline static bool marker_marked_p (const struct Lisp_Marker *m);
+inline static void set_marker_marked (struct Lisp_Marker *m);
 
-INLINE static bool overlay_marked_p (const struct Lisp_Overlay *m);
-INLINE static void set_overlay_marked (struct Lisp_Overlay *m);
+inline static bool overlay_marked_p (const struct Lisp_Overlay *m);
+inline static void set_overlay_marked (struct Lisp_Overlay *m);
 
-INLINE static bool interval_marked_p (INTERVAL i);
-INLINE static void set_interval_marked (INTERVAL i);
+inline static bool interval_marked_p (INTERVAL i);
+inline static void set_interval_marked (INTERVAL i);
 
 /* When scanning the C stack for live Lisp objects, Emacs keeps track of
    what memory allocated via lisp_malloc and lisp_align_malloc is intended
diff --git a/src/pdumper.c b/src/pdumper.c
index b255350c912..499c8dc27c7 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4852,7 +4852,7 @@ dump_make_lv_from_reloc (
 }
 
 /* Actually apply a dump relocation.  */
-static INLINE void
+static inline void
 dump_do_dump_relocation (
   const intptr_t dump_base,
   const struct dump_reloc reloc)