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/fnmatch/fnmatch.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/fnmatch/fnmatch.c')
| -rw-r--r-- | libc/misc/fnmatch/fnmatch.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index d25619b34..0fa043bad 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/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__ |