summaryrefslogtreecommitdiff
path: root/posix/glob.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-14 04:41:35 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-14 04:41:35 +0000
commit79937577d1e3e01b3fcc618366a9d7f78feed272 (patch)
treecd3243a5aa829f2a9d5be050460c35b631901e0b /posix/glob.h
parent61a807d07cd37b7e14fd382a9dd7740233f7d10b (diff)
downloadglibc-79937577d1e3e01b3fcc618366a9d7f78feed272.tar.gz
Update.
2004-09-13 Ulrich Drepper <drepper@redhat.com> * misc/sys/cdefs.h: Restore old definition of __P. * csu/munch.awk: Remove uses of __P and __PMT. * gmon/gmon.c: Likewise. * hesiod/hesiod.h: Likewise. * include/stdio.h: Likewise. * io/fts.c: Likewise. * libio/genops.c: Likewise. * libio/libioP.h: Likewise. * libio/fileops.c: Likewise. * libio/iolibio.h: Likewise. * libio/libio.h: Likewise. * libio/memstream.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/iopopen.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wgenops.c: Likewise. * libio/oldiopopen.c: Likewise. * locale/programs/xmalloc.c: Likewise. * locale/programs/xstrdup.c: Likewise. * malloc/mtrace.c: Likewise. * misc/getttyent.c: Likewise. * misc/getusershell.c: Likewise. * nis/rpcsvc/ypupd.h: Likewise. * posix/fnmatch.h: Likewise. * posix/glob.h: Likewise. * resolv/arpa/nameser.h: Likewise. * resolv/gethnamaddr.c: Likewise. * resolv/resolv.h: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/res_init.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * sysdeps/generic/chflags.c: Likewise. * sysdeps/generic/fchflags.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memcopy.h: Likewise. * sysdeps/generic/morecore.c: Likewise. * sysdeps/generic/sstk.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/standalone/arm/bits/errno.h: Likewise. * sysdeps/standalone/standalone.h: Likewise. * sysdeps/standalone/i386/force_cpu386/brdinit.c: Likewise. * sysdeps/standalone/i386/force_cpu386/_exit.c: Likewise. * sysdeps/unix/arm/start.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/wait4.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigvec.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/unix/sysv/getdents.c: Likewise. * sysdeps/unix/sysv/irix4/fpathconf.c: Likewise. * sysdeps/unix/sysv/irix4/getgroups.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/getrusage.c: Likewise. * sysdeps/unix/sysv/irix4/pathconf.c: Likewise. * sysdeps/unix/sysv/irix4/setgroups.c: Likewise. * sysdeps/unix/sysv/irix4/sigtramp.c: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/sysv/irix4/sysconf.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/getgroups.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/sethostname.c: Likewise. * sysdeps/unix/sysv/sysv4/setsid.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/getdents.c: Likewise. * time/tzset.c: Likewise. * time/strftime_l.c: Likewise. * time/strptime_l.c: Likewise. * crypt/md5.h: Likewise.
Diffstat (limited to 'posix/glob.h')
-rw-r--r--posix/glob.h74
1 files changed, 32 insertions, 42 deletions
diff --git a/posix/glob.h b/posix/glob.h
index 6bb7c7e8c0..f8aeb22426 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -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
@@ -25,11 +25,7 @@ extern "C" {
#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
+# ifndef __GLIBC__
# if !defined __GNUC__ || __GNUC__ < 2
# undef __const
# define __const const
@@ -37,10 +33,6 @@ extern "C" {
# 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 *
@@ -120,20 +112,19 @@ typedef struct
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */
- void (*gl_closedir) __PMT ((void *));
+ void (*gl_closedir) (void *);
#ifdef _GNU_SOURCE
- struct dirent *(*gl_readdir) __PMT ((void *));
+ struct dirent *(*gl_readdir) (void *);
#else
- void *(*gl_readdir) __PMT ((void *));
+ void *(*gl_readdir) (void *);
#endif
- __ptr_t (*gl_opendir) __PMT ((__const char *));
+ __ptr_t (*gl_opendir) (__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));
+ 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;
@@ -150,21 +141,19 @@ typedef struct
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
are used instead of the normal file access functions. */
- void (*gl_closedir) __PMT ((void *));
+ void (*gl_closedir) (void *);
# ifdef _GNU_SOURCE
- struct dirent64 *(*gl_readdir) __PMT ((void *));
+ struct dirent64 *(*gl_readdir) (void *);
# else
- void *(*gl_readdir) __PMT ((void *));
+ void *(*gl_readdir) (void *);
# endif
- __ptr_t (*gl_opendir) __PMT ((__const char *));
+ __ptr_t (*gl_opendir) (__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));
+ 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
@@ -183,26 +172,27 @@ typedef struct
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));
+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),
- glob_t *__restrict __pglob)) __asm__ ("glob64");
+extern int __REDIRECT_NTH (glob, (__const char *__restrict __pattern,
+ int __flags,
+ int (*__errfunc) (__const char *, int),
+ glob_t *__restrict __pglob), glob64);
-extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64");
+extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
#endif
#ifdef _LARGEFILE64_SOURCE
-extern int glob64 __P ((__const char *__restrict __pattern, int __flags,
- int (*__errfunc) (__const char *, int),
- glob64_t *__restrict __pglob));
+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
@@ -212,7 +202,7 @@ extern void globfree64 __P ((glob64_t *__pglob));
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