svn commit: trunk/uClibc/include
vapier at uclibc.org
vapier at uclibc.org
Tue Nov 15 23:37:52 UTC 2005
Author: vapier
Date: 2005-11-15 15:37:12 -0800 (Tue, 15 Nov 2005)
New Revision: 12271
Log:
import updates from glibc
Modified:
trunk/uClibc/include/glob.h
Changeset:
Modified: trunk/uClibc/include/glob.h
===================================================================
--- trunk/uClibc/include/glob.h 2005-11-15 23:36:26 UTC (rev 12270)
+++ trunk/uClibc/include/glob.h 2005-11-15 23:37:12 UTC (rev 12271)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,95,96,97,98,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,95-98,2000,2001,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,43 +19,22 @@
#ifndef _GLOB_H
#define _GLOB_H 1
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <sys/cdefs.h>
-#undef __ptr_t
-#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# if !defined __GLIBC__ || !defined __P
-# undef __P
-# undef __PMT
-# define __P(protos) protos
-# define __PMT(protos) protos
-# if !defined __GNUC__ || __GNUC__ < 2
-# undef __const
-# define __const const
-# endif
-# endif
-# define __ptr_t void *
-#else /* Not C++ or ANSI C. */
-# undef __P
-# undef __PMT
-# define __P(protos) ()
-# define __PMT(protos) ()
-# undef __const
-# define __const
-# define __ptr_t char *
-#endif /* C++ or ANSI C. */
+__BEGIN_DECLS
/* We need `size_t' for the following definitions. */
#ifndef __size_t
# if defined __GNUC__ && __GNUC__ >= 2
typedef __SIZE_TYPE__ __size_t;
-# ifdef _XOPEN_SOURCE
+# ifdef __USE_XOPEN
typedef __SIZE_TYPE__ size_t;
# endif
# else
-/* This is a guess. */
-typedef unsigned long int __size_t;
+# include <stddef.h>
+# ifndef __size_t
+# define __size_t size_t
+# endif
# endif
#else
/* The GNU CC stddef.h version defines __size_t as empty. We need a real
@@ -74,8 +53,7 @@
#define GLOB_NOESCAPE (1 << 6)/* Backslashes don't quote metacharacters. */
#define GLOB_PERIOD (1 << 7)/* Leading `.' can be matched by metachars. */
-#if (!defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _BSD_SOURCE \
- || defined _GNU_SOURCE)
+#if !defined __USE_POSIX2 || defined __USE_BSD || defined __USE_GNU
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
@@ -99,17 +77,15 @@
#define GLOB_ABORTED 2 /* Read error. */
#define GLOB_NOMATCH 3 /* No matches found. */
#define GLOB_NOSYS 4 /* Not implemented. */
-#ifdef _GNU_SOURCE
+#ifdef __USE_GNU
/* Previous versions of this file defined GLOB_ABEND instead of
GLOB_ABORTED. Provide a compatibility definition here. */
# define GLOB_ABEND GLOB_ABORTED
#endif
/* Structure describing a globbing run. */
-#if !defined _AMIGA && !defined VMS /* Buggy compiler. */
-# ifdef _GNU_SOURCE
+#ifdef __USE_GNU
struct stat;
-# endif
#endif
typedef struct
{
@@ -120,25 +96,24 @@
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */
- void (*gl_closedir) __PMT ((void *));
-#ifdef _GNU_SOURCE
- struct dirent *(*gl_readdir) __PMT ((void *));
+ void (*gl_closedir) (void *);
+#ifdef __USE_GNU
+ struct dirent *(*gl_readdir) (void *);
#else
- void *(*gl_readdir) __PMT ((void *));
+ void *(*gl_readdir) (void *);
#endif
- __ptr_t (*gl_opendir) __PMT ((__const char *));
-#ifdef _GNU_SOURCE
- int (*gl_lstat) __PMT ((__const char *__restrict,
- struct stat *__restrict));
- int (*gl_stat) __PMT ((__const char *__restrict, struct stat *__restrict));
+ void *(*gl_opendir) (__const char *);
+#ifdef __USE_GNU
+ int (*gl_lstat) (__const char *__restrict, struct stat *__restrict);
+ int (*gl_stat) (__const char *__restrict, struct stat *__restrict);
#else
- int (*gl_lstat) __PMT ((__const char *__restrict, void *__restrict));
- int (*gl_stat) __PMT ((__const char *__restrict, void *__restrict));
+ int (*gl_lstat) (__const char *__restrict, void *__restrict);
+ int (*gl_stat) (__const char *__restrict, void *__restrict);
#endif
} glob_t;
-#ifdef _LARGEFILE64_SOURCE
-# ifdef _GNU_SOURCE
+#ifdef __USE_LARGEFILE64
+# ifdef __USE_GNU
struct stat64;
# endif
typedef struct
@@ -150,26 +125,24 @@
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */
- void (*gl_closedir) __PMT ((void *));
-# ifdef _GNU_SOURCE
- struct dirent64 *(*gl_readdir) __PMT ((void *));
+ void (*gl_closedir) (void *);
+# ifdef __USE_GNU
+ struct dirent64 *(*gl_readdir) (void *);
# else
- void *(*gl_readdir) __PMT ((void *));
+ void *(*gl_readdir) (void *);
# endif
- __ptr_t (*gl_opendir) __PMT ((__const char *));
-# ifdef _GNU_SOURCE
- int (*gl_lstat) __PMT ((__const char *__restrict,
- struct stat64 *__restrict));
- int (*gl_stat) __PMT ((__const char *__restrict,
- struct stat64 *__restrict));
+ void *(*gl_opendir) (__const char *);
+# ifdef __USE_GNU
+ int (*gl_lstat) (__const char *__restrict, struct stat64 *__restrict);
+ int (*gl_stat) (__const char *__restrict, struct stat64 *__restrict);
# else
- int (*gl_lstat) __PMT ((__const char *__restrict, void *__restrict));
- int (*gl_stat) __PMT ((__const char *__restrict, void *__restrict));
+ int (*gl_lstat) (__const char *__restrict, void *__restrict);
+ int (*gl_stat) (__const char *__restrict, void *__restrict);
# endif
} glob64_t;
#endif
-#if _FILE_OFFSET_BITS == 64 && __GNUC__ < 2
+#if __USE_FILE_OFFSET64 && __GNUC__ < 2
# define glob glob64
# define globfree globfree64
#endif
@@ -182,13 +155,13 @@
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
-#if _FILE_OFFSET_BITS != 64 || __GNUC__ < 2
-extern int glob __P ((__const char *__restrict __pattern, int __flags,
- int (*__errfunc) (__const char *, int),
- glob_t *__restrict __pglob));
+#if !defined __USE_FILE_OFFSET64 || __GNUC__ < 2
+extern int glob (__const char *__restrict __pattern, int __flags,
+ int (*__errfunc) (__const char *, int),
+ glob_t *__restrict __pglob) __THROW;
/* Free storage allocated in PGLOB by a previous `glob' call. */
-extern void globfree __P ((glob_t *__pglob));
+extern void globfree (glob_t *__pglob) __THROW;
#else
extern int glob __P ((__const char *__restrict __pattern, int __flags,
int (*__errfunc) (__const char *, int),
@@ -197,26 +170,24 @@
extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64");
#endif
-#ifdef _LARGEFILE64_SOURCE
-extern int glob64 __P ((__const char *__restrict __pattern, int __flags,
- int (*__errfunc) (__const char *, int),
- glob64_t *__restrict __pglob));
+#ifdef __USE_LARGEFILE64
+extern int glob64 (__const char *__restrict __pattern, int __flags,
+ int (*__errfunc) (__const char *, int),
+ glob64_t *__restrict __pglob) __THROW;
-extern void globfree64 __P ((glob64_t *__pglob));
+extern void globfree64 (glob64_t *__pglob) __THROW;
#endif
-#ifdef _GNU_SOURCE
+#ifdef __USE_GNU
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero.
This function is not part of the interface specified by POSIX.2
but several programs want to use it. */
-extern int glob_pattern_p __P ((__const char *__pattern, int __quote));
+extern int glob_pattern_p (__const char *__pattern, int __quote) __THROW;
#endif
-#ifdef __cplusplus
-}
-#endif
+__END_DECLS
#endif /* glob.h */
More information about the uClibc-cvs
mailing list