[Emacs-diffs] Changes to emacs/src/charset.h

[Ken Raeburn]

Index: emacs/src/charset.h
diff -c emacs/src/charset.h:1.69 emacs/src/charset.h:1.70
*** emacs/src/charset.h:1.69    Tue Jul 16 12:37:06 2002
--- emacs/src/charset.h Tue Jul 16 15:48:00 2002
***************
*** 573,579 ****
      CHARIDX++;                                                                
   \
      if (STRING_MULTIBYTE (STRING))                                       \
        {                                                                       
   \
!       unsigned char *ptr = SDATA (STRING) + BYTEIDX;                     \
        int space_left = SBYTES (STRING) - BYTEIDX;                        \
        int actual_len;                                                    \
                                                                           \
--- 573,579 ----
      CHARIDX++;                                                                
   \
      if (STRING_MULTIBYTE (STRING))                                       \
        {                                                                       
   \
!       const unsigned char *ptr = SDATA (STRING) + BYTEIDX;               \
        int space_left = SBYTES (STRING) - BYTEIDX;                        \
        int actual_len;                                                    \
                                                                           \
***************
*** 590,596 ****
  #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX)  
\
  if (1)                                                                        
      \
    {                                                                         \
!     unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX;        \
      int fetch_string_char_space_left = SBYTES (STRING) - BYTEIDX;           \
      int actual_len;                                                         \
                                                                              \
--- 590,596 ----
  #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX)  
\
  if (1)                                                                        
      \
    {                                                                         \
!     const unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX;    
\
      int fetch_string_char_space_left = SBYTES (STRING) - BYTEIDX;           \
      int actual_len;                                                         \
                                                                              \
***************
*** 794,809 ****
  extern int string_to_char P_ ((const unsigned char *, int, int *));
  extern int char_printable_p P_ ((int c));
  extern int multibyte_form_length P_ ((const unsigned char *, int));
! extern void parse_str_as_multibyte P_ ((unsigned char *, int, int *, int *));
  extern int str_as_multibyte P_ ((unsigned char *, int, int, int *));
  extern int parse_str_to_multibyte P_ ((unsigned char *, int));
  extern int str_to_multibyte P_ ((unsigned char *, int, int));
  extern int str_as_unibyte P_ ((unsigned char *, int));
  extern int get_charset_id P_ ((Lisp_Object));
! extern int find_charset_in_text P_ ((unsigned char *, int, int, int *,
                                    Lisp_Object));
  extern int strwidth P_ ((unsigned char *, int));
! extern int c_string_width P_ ((unsigned char *, int, int, int *, int *));
  extern int lisp_string_width P_ ((Lisp_Object, int, int *, int *));
  extern int char_bytes P_ ((int));
  extern int char_valid_p P_ ((int, int));
--- 794,810 ----
  extern int string_to_char P_ ((const unsigned char *, int, int *));
  extern int char_printable_p P_ ((int c));
  extern int multibyte_form_length P_ ((const unsigned char *, int));
! extern void parse_str_as_multibyte P_ ((const unsigned char *, int, int *,
!                                       int *));
  extern int str_as_multibyte P_ ((unsigned char *, int, int, int *));
  extern int parse_str_to_multibyte P_ ((unsigned char *, int));
  extern int str_to_multibyte P_ ((unsigned char *, int, int));
  extern int str_as_unibyte P_ ((unsigned char *, int));
  extern int get_charset_id P_ ((Lisp_Object));
! extern int find_charset_in_text P_ ((const unsigned char *, int, int, int *,
                                    Lisp_Object));
  extern int strwidth P_ ((unsigned char *, int));
! extern int c_string_width P_ ((const unsigned char *, int, int, int *, int 
*));
  extern int lisp_string_width P_ ((Lisp_Object, int, int *, int *));
  extern int char_bytes P_ ((int));
  extern int char_valid_p P_ ((int, int));