[git commit nptl] fnmatch.c: Include unistd.h before undefining _LIBC.

Khem Raj raj.khem at gmail.com
Sat Aug 1 09:26:11 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=b793184cc94aa9e00a03d3f29586e95a1419a0cd
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 libc/misc/fnmatch/fnmatch.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 00fd4d4..cf30867 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -21,6 +21,14 @@
 # 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
+ */
+
+#include <unistd.h>
 #include <features.h>
 #ifdef __UCLIBC__
 # undef _LIBC
@@ -41,7 +49,6 @@
 #include <errno.h>
 #include <fnmatch.h>
 #include <ctype.h>
-#include <unistd.h>
 
 #if HAVE_STRING_H || defined _LIBC
 # include <string.h>
@@ -212,7 +219,7 @@ extern int errno;
 # endif
 
 /* Global variable.  */
-smallint posixly_correct;
+static smallint posixly_correct;
 
 /* This function doesn't exist on most systems.  */
 
-- 
1.6.3.3



More information about the uClibc-cvs mailing list