===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flexdef.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/lex/flexdef.h	2015/11/19 23:20:34	1.12
--- src/usr.bin/lex/flexdef.h	2015/11/19 23:34:56	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: flexdef.h,v 1.12 2015/11/19 23:20:34 tedu Exp $	*/
  
  /* flexdef - definitions file for flex */
  
--- 1,4 ----
! /*	$OpenBSD: flexdef.h,v 1.13 2015/11/19 23:34:56 mmcc Exp $	*/
  
  /* flexdef - definitions file for flex */
  
***************
*** 110,116 ****
  
  /* Always be prepared to generate an 8-bit scanner. */
  #define CSIZE 256
- #define Char unsigned char
  
  /* Size of input alphabet - should be size of ASCII set. */
  #ifndef DEFAULT_CSIZE
--- 110,115 ----
***************
*** 635,641 ****
  
  extern int lastccl, *cclmap, *ccllen, *cclng, cclreuse;
  extern int current_maxccls, current_max_ccl_tbl_size;
! extern Char *ccltbl;
  
  
  /* Variables for miscellaneous information:
--- 634,640 ----
  
  extern int lastccl, *cclmap, *ccllen, *cclng, cclreuse;
  extern int current_maxccls, current_max_ccl_tbl_size;
! extern u_char *ccltbl;
  
  
  /* Variables for miscellaneous information:
***************
*** 705,714 ****
  	(char *) reallocate_array( (void *) array, size, sizeof( char ) )
  
  #define allocate_Character_array(size) \
! 	(Char *) allocate_array( size, sizeof( Char ) )
  
  #define reallocate_Character_array(array,size) \
! 	(Char *) reallocate_array( (void *) array, size, sizeof( Char ) )
  
  
  /* Used to communicate between scanner and parser.  The type should really
--- 704,713 ----
  	(char *) reallocate_array( (void *) array, size, sizeof( char ) )
  
  #define allocate_Character_array(size) \
! 	(u_char *) allocate_array( size, sizeof( u_char ) )
  
  #define reallocate_Character_array(array,size) \
! 	(u_char *) reallocate_array( (void *) array, size, sizeof( u_char ) )
  
  
  /* Used to communicate between scanner and parser.  The type should really
***************
*** 761,767 ****
  extern int cre8ecs PROTO ((int[], int[], int));
  
  /* Update equivalence classes based on character class transitions. */
! extern void mkeccl PROTO ((Char[], int, int[], int[], int, int));
  
  /* Create equivalence class for single character. */
  extern void mkechar PROTO ((int, int[], int[]));
--- 760,766 ----
  extern int cre8ecs PROTO ((int[], int[], int));
  
  /* Update equivalence classes based on character class transitions. */
! extern void mkeccl PROTO ((u_char[], int, int[], int[], int, int));
  
  /* Create equivalence class for single character. */
  extern void mkechar PROTO ((int, int[], int[]));
***************
*** 840,852 ****
  extern void check_char PROTO ((int c));
  
  /* Replace upper-case letter to lower-case. */
! extern Char clower PROTO ((int));
  
  /* Returns a dynamically allocated copy of a string. */
  extern char *copy_string PROTO ((const char *));
  
  /* Returns a dynamically allocated copy of a (potentially) unsigned string. */
! extern Char *copy_unsigned_string PROTO ((Char *));
  
  /* Compare two characters for use by qsort with '\0' sorting last. */
  extern int cclcmp PROTO ((const void *, const void *));
--- 839,851 ----
  extern void check_char PROTO ((int c));
  
  /* Replace upper-case letter to lower-case. */
! extern u_char clower PROTO ((int));
  
  /* Returns a dynamically allocated copy of a string. */
  extern char *copy_string PROTO ((const char *));
  
  /* Returns a dynamically allocated copy of a (potentially) unsigned string. */
! extern u_char *copy_unsigned_string PROTO ((u_char *));
  
  /* Compare two characters for use by qsort with '\0' sorting last. */
  extern int cclcmp PROTO ((const void *, const void *));
***************
*** 885,891 ****
  #endif /* ! HAVE_DECL___func__ */
  
  /* Convert a hexadecimal digit string to an integer value. */
! extern int htoi PROTO ((Char[]));
  
  /* Report an error message formatted with one integer argument. */
  extern void lerrif PROTO ((const char *, int));
--- 884,890 ----
  #endif /* ! HAVE_DECL___func__ */
  
  /* Convert a hexadecimal digit string to an integer value. */
! extern int htoi PROTO ((u_char[]));
  
  /* Report an error message formatted with one integer argument. */
  extern void lerrif PROTO ((const char *, int));
***************
*** 916,925 ****
  extern int myctoi PROTO ((const char *));
  
  /* Return character corresponding to escape sequence. */
! extern Char myesc PROTO ((Char[]));
  
  /* Convert an octal digit string to an integer value. */
! extern int otoi PROTO ((Char[]));
  
  /* Output a (possibly-formatted) string to the generated scanner. */
  extern void out PROTO ((const char *));
--- 915,924 ----
  extern int myctoi PROTO ((const char *));
  
  /* Return character corresponding to escape sequence. */
! extern u_char myesc PROTO ((u_char[]));
  
  /* Convert an octal digit string to an integer value. */
! extern int otoi PROTO ((u_char[]));
  
  /* Output a (possibly-formatted) string to the generated scanner. */
  extern void out PROTO ((const char *));
***************
*** 1031,1043 ****
  /* from file sym.c */
  
  /* Save the text of a character class. */
! extern void cclinstal PROTO ((Char[], int));
  
  /* Lookup the number associated with character class. */
! extern int ccllookup PROTO ((Char[]));
  
! extern void ndinstal PROTO ((const char *, Char[]));	/* install a name definition */
! extern Char *ndlookup PROTO ((const char *));	/* lookup a name definition */
  
  /* Increase maximum number of SC's. */
  extern void scextend PROTO ((void));
--- 1030,1042 ----
  /* from file sym.c */
  
  /* Save the text of a character class. */
! extern void cclinstal PROTO ((u_char[], int));
  
  /* Lookup the number associated with character class. */
! extern int ccllookup PROTO ((u_char[]));
  
! extern void ndinstal PROTO ((const char *, u_char[]));	/* install a name definition */
! extern u_char *ndlookup PROTO ((const char *));	/* lookup a name definition */
  
  /* Increase maximum number of SC's. */
  extern void scextend PROTO ((void));