X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Finsdel.h;h=70452ae0242118009df6b0f90c44c0061a7e1f6f;hb=09b372c3074a7cc339a61b2297583f2b9edefe86;hp=944fed3e9e280020ddd075c555338cda45973ed8;hpb=669565bfdc5d704dfb1d5ac1a0ec01fb3615a1ae;p=chise%2Fxemacs-chise.git.1

diff --git a/src/insdel.h b/src/insdel.h
index 944fed3..70452ae 100644
--- a/src/insdel.h
+++ b/src/insdel.h
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Mostly rewritten by Ben Wing. */
 
-#ifndef _XEMACS_INSDEL_H_
-#define _XEMACS_INSDEL_H_
+#ifndef INCLUDED_insdel_h_
+#define INCLUDED_insdel_h_
 
 /************************************************************************/
 /*                        changing a buffer's text                      */
@@ -38,16 +38,16 @@ void end_multiple_change (struct buffer *buf, int count);
 #define INSDEL_NO_LOCKING 2
 
 Charcount buffer_insert_string_1 (struct buffer *buf, Bufpos pos,
-				  CONST Bufbyte *nonreloc, Lisp_Object reloc,
+				  const Bufbyte *nonreloc, Lisp_Object reloc,
 				  Bytecount offset, Bytecount length,
 				  int flags);
 Charcount buffer_insert_raw_string_1 (struct buffer *buf, Bufpos pos,
-				      CONST Bufbyte *nonreloc,
+				      const Bufbyte *nonreloc,
 				      Bytecount length, int flags);
 Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Bufpos pos,
 				       Lisp_Object str, int flags);
 Charcount buffer_insert_c_string_1 (struct buffer *buf, Bufpos pos,
-				    CONST char *s, int flags);
+				    const char *s, int flags);
 Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Bufpos pos,
 				      Emchar ch, int flags);
 Charcount buffer_insert_c_char_1 (struct buffer *buf, Bufpos pos, char c,
@@ -140,11 +140,11 @@ void buffer_reset_changes (struct buffer *buf);
 /************************************************************************/
 
 Memind do_marker_adjustment (Memind mpos, Memind from,
-			     Memind to, int amount);
+			     Memind to, Bytecount amount);
 
-void fixup_internal_substring (CONST Bufbyte *nonreloc,
+void fixup_internal_substring (const Bufbyte *nonreloc,
 			       Lisp_Object reloc,
-			       int offset, int *len);
+			       Bytecount offset, Bytecount *len);
 
 /* In font-lock.c */
 void font_lock_maybe_update_syntactic_caches (struct buffer *buf,
@@ -159,4 +159,4 @@ void barf_if_buffer_read_only (struct buffer *buf, Bufpos from,
 void init_buffer_text (struct buffer *b);
 void uninit_buffer_text (struct buffer *b);
 
-#endif /* _XEMACS_INSDEL_H_ */
+#endif /* INCLUDED_insdel_h_ */