Imported Upstream version 2.5.37upstream/2.5.37

1 files changed, 7 insertions, 7 deletions

diff --git a/flexdef.h b/flexdef.h
index d038952..0e81410 100644
--- a/flexdef.h
+++ b/flexdef.h
@@ -91,7 +91,9 @@ char *alloca ();
 #define true 1
 #define false 0
 #endif
+#ifdef HAVE_REGEX_H
 #include <regex.h>
+#endif
 #include "flexint.h"
 
 /* We use gettext. So, when we write strings which should be translated, we mark them with _() */
@@ -414,7 +416,6 @@ extern int yymore_really_used, reject_really_used;
  * dataline - number of contiguous lines of data in current data
  * 	statement.  Used to generate readable -f output
  * linenum - current input line number
- * out_linenum - current output line number
  * skelfile - the skeleton file
  * skel - compiled-in skeleton array
  * skel_ind - index into "skel" array, if skelfile is nil
@@ -442,7 +443,7 @@ extern int yymore_really_used, reject_really_used;
  * 	to "action_array"
  */
 
-extern int datapos, dataline, linenum, out_linenum;
+extern int datapos, dataline, linenum;
 extern FILE *skelfile, *yyin, *backing_up_file;
 extern const char *skel[];
 extern int skel_ind;
@@ -847,8 +848,8 @@ extern int all_lower PROTO ((register char *));
 /* True if a string is all upper case. */
 extern int all_upper PROTO ((register char *));
 
-/* Bubble sort an integer array. */
-extern void bubble PROTO ((int[], int));
+/* Compare two integers for use by qsort. */
+extern int intcmp PROTO ((const void *, const void *));
 
 /* Check a character to make sure it's in the expected range. */
 extern void check_char PROTO ((int c));
@@ -862,8 +863,8 @@ extern char *copy_string PROTO ((register const char *));
 /* Returns a dynamically allocated copy of a (potentially) unsigned string. */
 extern Char *copy_unsigned_string PROTO ((register Char *));
 
-/* Shell sort a character array. */
-extern void cshell PROTO ((Char[], int, int));
+/* Compare two characters for use by qsort with '\0' sorting last. */
+extern int cclcmp PROTO ((const void *, const void *));
 
 /* Finish up a block of data declarations. */
 extern void dataend PROTO ((void));
@@ -937,7 +938,6 @@ extern void out PROTO ((const char *));
 extern void out_dec PROTO ((const char *, int));
 extern void out_dec2 PROTO ((const char *, int, int));
 extern void out_hex PROTO ((const char *, unsigned int));
-extern void out_line_count PROTO ((const char *));
 extern void out_str PROTO ((const char *, const char *));
 extern void out_str3
 PROTO ((const char *, const char *, const char *, const char *));