Browse Source

regex_old: convert static flag variable to smallint

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko 15 years ago
parent
commit
10f19b4565
2 changed files with 4 additions and 10 deletions
  1. 1 7
      libc/misc/fnmatch/fnmatch.c
  2. 3 3
      libc/misc/regex/regex_old.c

+ 1 - 7
libc/misc/fnmatch/fnmatch.c

@@ -21,13 +21,7 @@
 # include <config.h>
 #endif
 
-/* include unistd.h before we undefine _LIBC
- * because smallint is defined in unistd.h based
- * on _LIBC. For architectures that dont define
- * smallint of there own and rely upon the definition
- * from unistd.h will not build this file otherwise
- */
-
+/* unistd.h must be included with _LIBC defined: we need smallint */
 #include <unistd.h>
 #include <features.h>
 #ifdef __UCLIBC__

+ 3 - 3
libc/misc/regex/regex_old.c

@@ -23,7 +23,8 @@
 /* To exclude some unwanted junk.... */
 #undef emacs
 #include <features.h>
-
+/* unistd.h must be included with _LIBC defined: we need smallint */
+#include <unistd.h>
 #ifdef __UCLIBC__
 # undef _LIBC
 # define _REGEX_RE_COMP
@@ -33,7 +34,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdio.h>
 
 /* AIX requires this to be the first thing in the file. */
@@ -263,7 +263,7 @@ static void
 init_syntax_once (void)
 {
    register int c;
-   static int done = 0;
+   static smallint done = 0;
 
    if (done)
      return;