X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fextents.h;h=d8afb563c6dcd99de124b1ed836aa1eeb41780da;hb=aa982acf01b4e35675a624d78c9e5ee109c1203e;hp=2a2ab9dba3521f21caa8f21f5cf3d1bd5f1f4e9c;hpb=b5eeb6918c29470b36f8461c402eb0c65cb19bd2;p=chise%2Fxemacs-chise.git

diff --git a/src/extents.h b/src/extents.h
index 2a2ab9d..d8afb56 100644
--- a/src/extents.h
+++ b/src/extents.h
@@ -20,8 +20,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-#ifndef _XEMACS_EXTENTS_H_
-#define _XEMACS_EXTENTS_H_
+#ifndef INCLUDED_extents_h_
+#define INCLUDED_extents_h_
 
 DECLARE_LRECORD (extent, struct extent);
 #define XEXTENT(x) XRECORD (x, extent, struct extent)
@@ -177,8 +177,8 @@ void flush_cached_extent_info (Lisp_Object extent_info);
 
 #define extent_no_chase_normal_field(e, field) ((e)->flags.field)
 
-INLINE struct extent_auxiliary *extent_aux_or_default (EXTENT e);
-INLINE struct extent_auxiliary *
+INLINE_HEADER struct extent_auxiliary *extent_aux_or_default (EXTENT e);
+INLINE_HEADER struct extent_auxiliary *
 extent_aux_or_default (EXTENT e)
 {
   return e->flags.has_aux ?
@@ -259,8 +259,8 @@ extent_aux_or_default (EXTENT e)
 #define extent_internal_p(e)	     extent_normal_field (e, internal)
 #define extent_in_red_event_p(e)     extent_normal_field (e, in_red_event)
 
-INLINE Lisp_Object * extent_no_chase_plist_addr (EXTENT e);
-INLINE Lisp_Object *
+INLINE_HEADER Lisp_Object * extent_no_chase_plist_addr (EXTENT e);
+INLINE_HEADER Lisp_Object *
 extent_no_chase_plist_addr (EXTENT e)
 {
   return e->flags.has_aux ? &XCDR (e->plist) : &e->plist;
@@ -318,6 +318,7 @@ EXFUN (Fset_extent_endpoints, 4);
 EXFUN (Fset_extent_parent, 2);
 
 extern int inside_undo;
+extern int in_modeline_generation;
 
 struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string,
 					     struct frame *frm);
@@ -339,8 +340,8 @@ EXTENT extent_ancestor_1 (EXTENT e);
 /* extent_ancestor() chases all the parent links until there aren't any
    more.  extent_ancestor_1() does the same thing but it a function;
    the following optimizes the most common case. */
-INLINE EXTENT extent_ancestor (EXTENT e);
-INLINE EXTENT
+INLINE_HEADER EXTENT extent_ancestor (EXTENT e);
+INLINE_HEADER EXTENT
 extent_ancestor (EXTENT e)
 {
   return e->flags.has_parent ? extent_ancestor_1 (e) : e;
@@ -397,4 +398,4 @@ int compute_buffer_extent_usage (struct buffer *b,
 
 #endif /* emacs */
 
-#endif /* _XEMACS_EXTENTS_H_ */
+#endif /* INCLUDED_extents_h_ */