diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:29 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:33 -0700 |
| commit | f10d127d36ada5b202cdea521e61b05522beb192 (patch) | |
| tree | 44ae75bf0745de49fb46616afd4cf577cf7a258a /libc/misc/regex/regex_old.c | |
| parent | c3af26045aa44286482fbfe93097f24b48cfb6a3 (diff) | |
| parent | 384a55ef9f3387ed33eadab3eefe5057b4daeadb (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/misc/utmp/utent.c
libc/sysdeps/linux/i386/bits/syscalls.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/misc/regex/regex_old.c')
| -rw-r--r-- | libc/misc/regex/regex_old.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index bc2ad6cb8..a3c30b51a 100644 --- a/libc/misc/regex/regex_old.c +++ b/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; |