aboutsummaryrefslogtreecommitdiff
path: root/posix/glob.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-23 13:44:50 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-23 13:44:50 +0000
commit24f25de65657d7ac9ccec63447efbe415110435b (patch)
tree3a34a92cc12e9a07636c4a074d86f1a674a2d019 /posix/glob.h
parentd6787ff2579c3ffa48219027498ed8aca3e19fc4 (diff)
downloadglibc-24f25de65657d7ac9ccec63447efbe415110435b.zip
glibc-24f25de65657d7ac9ccec63447efbe415110435b.tar.gz
glibc-24f25de65657d7ac9ccec63447efbe415110435b.tar.bz2
Update.
* version.h (VERSION): Bump to 2.0.99. * posix/fnmath.h: Don't redefine __P when used in glibc. * posix/glob.h: Likewise. * inet/rcmd.c (__ivaliduser2): Fix memory leak. Patch by Dick Streefland <dick_streefland@tasking.com>. * stdio-common/tst-ungetc.c: Add more test cases. * sysdeps/unix/sysv/linux/Dist: Add linux_fsinfo.h. * sysdeps/unix/sysv/linux/fstatvfs.c: Move filesystem magic number definitions to ... * sysdeps/unix/sysv/linux/linux_fsinfo.h: ...here. New file. * sysdeps/unix/sysv/linux/fpathconf.c: New file. * sysdeps/unix/sysv/linux/pathconf.c: New file. * sysdeps/unix/sysv/linux/alpha/fpathconf.c: Handle _PC_LINK_MAX here. * sysdeps/unix/sysv/linux/alpha/pathconf.c: Likewise. 1998-10-20 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/arm/bits/armsigctx.h: Include <asm/ptrace.h> to define struct pt_regs. * sysdeps/unix/sysv/linux/arm/profil-counter.h: Don't bother including <asm/ptrace.h> here. * sysdeps/unix/sysv/linux/arm/sysdep.S: Remove spurious call to C_SYMBOL_NAME macro. 1998-10-23 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/generic/sys/ptrace.h (__ptrace_request): Remove comma at end of enumerator list. * sysdeps/unix/sysv/linux/sys/ptrace.h (__ptrace_request): Likewise. * posix/wordexp.h: Likewise. * db/db.h: Use __PMT instead of __P in typedefs. * db/mpool.h: Likewise. * sysdeps/generic/bits/siginfo.h: Likewise. * nis/rpcsvc/ypclnt.h: Likewise. 1998-10-23 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'posix/glob.h')
-rw-r--r--posix/glob.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/posix/glob.h b/posix/glob.h
index f4c0974..55208e1 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -24,15 +24,17 @@ extern "C" {
#undef __ptr_t
#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# undef __P
-# undef __PMT
-# define __P(protos) protos
-# define __PMT(protos) protos
-# define __ptr_t void *
-# if !defined __GNUC__ || __GNUC__ < 2
-# undef __const
-# define __const const
+# 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