AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
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.
This commit is contained in:
Ulrich Drepper 2004-08-12 17:42:16 +00:00
parent 693aa14981
commit 2566e5f3a3
11 changed files with 70 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
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.
2004-08-12 Ulrich Drepper <drepper@redhat.com> 2004-08-12 Ulrich Drepper <drepper@redhat.com>
* po/ca.po: Update from translation team. * po/ca.po: Update from translation team.

7
bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +32,8 @@
#define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -51,3 +54,5 @@ struct shmid_ds
__pid_t shm_lpid; /* pid of last shmop */ __pid_t shm_lpid; /* pid of last shmop */
shmatt_t shm_nattch; /* number of current attaches */ shmatt_t shm_nattch; /* number of current attaches */
}; };
__END_DECLS

7
resolv/res_query.c
View File

@ -239,8 +239,11 @@ __libc_res_nsearch(res_state statp,
return (__libc_res_nquery(statp, cp, class, type, answer, return (__libc_res_nquery(statp, cp, class, type, answer,
anslen, answerp)); anslen, answerp));
printf("dots=%d, statp->ndots=%d, trailing_dot=%d, name=%s\n", #ifdef DEBUG
(int)dots,(int)statp->ndots,(int)trailing_dot,name); if (statp->options & RES_DEBUG)
printf("dots=%d, statp->ndots=%d, trailing_dot=%d, name=%s\n",
(int)dots,(int)statp->ndots,(int)trailing_dot,name);
#endif
/* /*
* If there are enough dots in the name, let's just give it a * If there are enough dots in the name, let's just give it a

7
sysdeps/generic/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +32,8 @@
#define SHM_LOCK 11 /* lock segment (root only) */ #define SHM_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -51,3 +54,5 @@ struct shmid_ds
__pid_t shm_lpid; /* pid of last shmop */ __pid_t shm_lpid; /* pid of last shmop */
shmatt_t shm_nattch; /* number of current attaches */ shmatt_t shm_nattch; /* number of current attaches */
}; };
__END_DECLS

7
sysdeps/gnu/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -90,3 +93,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

7
sysdeps/unix/sysv/linux/alpha/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -93,3 +96,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

4
sysdeps/unix/sysv/linux/bits/shm.h
View File

@ -97,6 +97,6 @@ struct shm_info
unsigned long int swap_successes; unsigned long int swap_successes;
}; };
__END_DECLS
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

7
sysdeps/unix/sysv/linux/powerpc/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -105,3 +108,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

6
sysdeps/unix/sysv/linux/s390/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -103,3 +105,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

7
sysdeps/unix/sysv/linux/sparc/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -103,3 +106,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS

7
sysdeps/unix/sysv/linux/x86_64/bits/shm.h
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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_LOCK 11 /* lock segment (root only) */
#define SHM_UNLOCK 12 /* unlock segment (root only) */ #define SHM_UNLOCK 12 /* unlock segment (root only) */
__BEGIN_DECLS
/* Segment low boundary address multiple. */ /* Segment low boundary address multiple. */
#define SHMLBA (__getpagesize ()) #define SHMLBA (__getpagesize ())
extern int __getpagesize (void) __THROW __attribute__ ((__const__)); extern int __getpagesize (void) __THROW __attribute__ ((__const__));
@ -102,3 +105,5 @@ struct shm_info
}; };
#endif /* __USE_MISC */ #endif /* __USE_MISC */
__END_DECLS