X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmultibyte.h;h=4468a3b8e321ccd3ded74ea683f179b7bbe08165;hb=87c4768b9f74b6d48fb56908f29fb1dccadb11ea;hp=8c5770a94c53578485d2d933a1134c54be5d646e;hpb=f52a96980ed9280f8f906a20d4b899dc0b027644;p=chise%2Fxemacs-chise.git-

diff --git a/src/multibyte.h b/src/multibyte.h
index 8c5770a..4468a3b 100644
--- a/src/multibyte.h
+++ b/src/multibyte.h
@@ -147,7 +147,7 @@ Boston, MA 02111-1307, USA.  */
 #define REAL_INC_CHARPTR(ptr) \
   ((void) ((ptr) += REP_BYTES_BY_FIRST_BYTE (* (unsigned char *) (ptr))))
 
-#define REAL_INC_CHARBYTIND(ptr,pos) \
+#define REAL_INC_CHARBYTIND(ptr, pos) \
   (pos += REP_BYTES_BY_FIRST_BYTE (* (unsigned char *) (ptr)))
 
 #define REAL_DEC_CHARPTR(ptr) do {	\
@@ -160,9 +160,9 @@ Boston, MA 02111-1307, USA.  */
   REAL_INC_CHARPTR (ptr);		\
 } while (0)
 
-#define INC_CHARBYTIND(ptr,pos) do {		\
-  ASSERT_VALID_CHARPTR (ptr);		\
-  REAL_INC_CHARBYTIND (ptr,pos);		\
+#define INC_CHARBYTIND(ptr, pos) do {		\
+  ASSERT_VALID_CHARPTR (ptr);			\
+  REAL_INC_CHARBYTIND (ptr, pos);		\
 } while (0)
 
 #define DEC_CHARPTR(ptr) do {			\
@@ -171,11 +171,11 @@ Boston, MA 02111-1307, USA.  */
   REAL_DEC_CHARPTR (dc_ptr2);			\
   assert (dc_ptr1 - dc_ptr2 ==			\
 	  REP_BYTES_BY_FIRST_BYTE (*dc_ptr2));	\
-  (ptr) = dc_ptr2;				\
+  (ptr) = (Bufbyte *) dc_ptr2;			\
 } while (0)
 
 #else /* ! ERROR_CHECK_BUFPOS */
-#define INC_CHARBYTIND(ptr,pos) REAL_INC_CHARBYTIND (ptr,pos)
+#define INC_CHARBYTIND(ptr, pos) REAL_INC_CHARBYTIND (ptr, pos)
 #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr)
 #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr)
 #endif /* ! ERROR_CHECK_BUFPOS */