X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmultibyte.h;h=8c5770a94c53578485d2d933a1134c54be5d646e;hb=3aca7317dd930beecbddba646284279744087e69;hp=fc43bb6e796d14cc0411b931b5a5f7cf30996d69;hpb=3a459be145efa10fca53a7d4645c9d845227f7f9;p=chise%2Fxemacs-chise.git- diff --git a/src/multibyte.h b/src/multibyte.h index fc43bb6..8c5770a 100644 --- a/src/multibyte.h +++ b/src/multibyte.h @@ -166,8 +166,8 @@ Boston, MA 02111-1307, USA. */ } while (0) #define DEC_CHARPTR(ptr) do { \ - CONST Bufbyte *dc_ptr1 = (ptr); \ - CONST Bufbyte *dc_ptr2 = dc_ptr1; \ + const Bufbyte *dc_ptr1 = (ptr); \ + const Bufbyte *dc_ptr2 = dc_ptr1; \ REAL_DEC_CHARPTR (dc_ptr2); \ assert (dc_ptr1 - dc_ptr2 == \ REP_BYTES_BY_FIRST_BYTE (*dc_ptr2)); \ @@ -185,9 +185,10 @@ Boston, MA 02111-1307, USA. */ /* section of internally-formatted text */ /* -------------------------------------------------------------- */ -INLINE CONST Bufbyte *charptr_n_addr (CONST Bufbyte *ptr, Charcount offset); -INLINE CONST Bufbyte * -charptr_n_addr (CONST Bufbyte *ptr, Charcount offset) +INLINE_HEADER const Bufbyte * +charptr_n_addr (const Bufbyte *ptr, Charcount offset); +INLINE_HEADER const Bufbyte * +charptr_n_addr (const Bufbyte *ptr, Charcount offset) { return ptr + charcount_to_bytecount (ptr, offset); }