[Emacs-diffs] Changes to emacs/src/regex.c [lexbind]

[Miles Bader]

Index: emacs/src/regex.c
diff -c emacs/src/regex.c:1.176.2.5 emacs/src/regex.c:1.176.2.6
*** emacs/src/regex.c:1.176.2.5 Tue Jul  6 09:31:31 2004
--- emacs/src/regex.c   Tue Jul  6 10:14:29 2004
***************
*** 1961,2001 ****
         }                                                              \
      } while (0)
  
! #if WIDE_CHAR_SUPPORT
! /* The GNU C library provides support for user-defined character classes
!    and the functions from ISO C amendement 1.  */
! # ifdef CHARCLASS_NAME_MAX
! #  define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
! # else
! /* This shouldn't happen but some implementation might still have this
!    problem.  Use a reasonable default value.  */
! #  define CHAR_CLASS_MAX_LENGTH 256
! # endif
! typedef wctype_t re_wctype_t;
! typedef wchar_t re_wchar_t;
! # define re_wctype wctype
! # define re_iswctype iswctype
! # define re_wctype_to_bit(cc) 0
! #else
! # define CHAR_CLASS_MAX_LENGTH  9 /* Namely, `multibyte'.  */
! # define btowc(c) c
! 
! /* Character classes.  */
! typedef enum { RECC_ERROR = 0,
!              RECC_ALNUM, RECC_ALPHA, RECC_WORD,
!              RECC_GRAPH, RECC_PRINT,
!              RECC_LOWER, RECC_UPPER,
!              RECC_PUNCT, RECC_CNTRL,
!              RECC_DIGIT, RECC_XDIGIT,
!              RECC_BLANK, RECC_SPACE,
!              RECC_MULTIBYTE, RECC_NONASCII,
!              RECC_ASCII, RECC_UNIBYTE
! } re_wctype_t;
! 
! typedef int re_wchar_t;
  
  /* Map a string to the char class it names (if any).  */
! static re_wctype_t
  re_wctype (str)
       re_char *str;
  {
--- 1961,1970 ----
         }                                                              \
      } while (0)
  
! #if ! WIDE_CHAR_SUPPORT
  
  /* Map a string to the char class it names (if any).  */
! re_wctype_t
  re_wctype (str)
       re_char *str;
  {
***************
*** 2021,2027 ****
  }
  
  /* True iff CH is in the char class CC.  */
! static boolean
  re_iswctype (ch, cc)
       int ch;
       re_wctype_t cc;
--- 1990,1996 ----
  }
  
  /* True iff CH is in the char class CC.  */
! boolean
  re_iswctype (ch, cc)
       int ch;
       re_wctype_t cc;