diff options
author | Ulrich Drepper <drepper@redhat.com> | 2004-08-12 17:42:16 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2004-08-12 17:42:16 +0000 |
commit | 2566e5f3a377e31c7c974bdddee8cb55ebdafb1f (patch) | |
tree | 8094ff5c295bd6a26b0738587a8fe252e56a4cac /sysdeps/unix/sysv/linux | |
parent | 693aa14981749e34ea742acfcfe8be9eaec2baa7 (diff) | |
download | glibc-2566e5f3a377e31c7c974bdddee8cb55ebdafb1f.tar glibc-2566e5f3a377e31c7c974bdddee8cb55ebdafb1f.tar.gz glibc-2566e5f3a377e31c7c974bdddee8cb55ebdafb1f.tar.bz2 glibc-2566e5f3a377e31c7c974bdddee8cb55ebdafb1f.zip |
Update.
2004-08-12 Jakub Jelinek <jakub@redhat.com>
* resolv/res_query.c (__libc_res_nsearch): Protect the debugging
printf with #ifdef DEBUG and RES_DEBUG check.
* sysdeps/unix/sysv/linux/bits/shm.h: Move __END_DECLS after
__USE_MISC #endif.
* sysdeps/generic/bits/shm.h: Add __BEGIN_DECLS for __getpagesize
declaration.
* sysdeps/gnu/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/shm.h | 7 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/shm.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/shm.h | 7 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/shm.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/shm.h | 7 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/shm.h | 7 |
6 files changed, 31 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/sysdeps/unix/sysv/linux/alpha/bits/shm.h index 418426511c..bbee434ea0 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/shm.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -93,3 +96,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h index 639c126314..225b89db2d 100644 --- a/sysdeps/unix/sysv/linux/bits/shm.h +++ b/sysdeps/unix/sysv/linux/bits/shm.h @@ -97,6 +97,6 @@ struct shm_info unsigned long int swap_successes; }; -__END_DECLS - #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h index 38379ace79..7705fb64d4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -105,3 +108,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/s390/bits/shm.h b/sysdeps/unix/sysv/linux/s390/bits/shm.h index 682e24e8b2..b7c2ad0514 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/shm.h +++ b/sysdeps/unix/sysv/linux/s390/bits/shm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 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 @@ -36,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -103,3 +105,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h index 144f311740..f075be8d8a 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 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 @@ -36,6 +37,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -103,3 +106,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h index 005d643bbf..4282d75617 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 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 @@ -35,6 +36,8 @@ #define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */ +__BEGIN_DECLS + /* Segment low boundary address multiple. */ #define SHMLBA (__getpagesize ()) extern int __getpagesize (void) __THROW __attribute__ ((__const__)); @@ -102,3 +105,5 @@ struct shm_info }; #endif /* __USE_MISC */ + +__END_DECLS |