* [PATCH] Uglify function parameter names in installed headers
@ 2009-02-16 14:56 Jakub Jelinek
2009-02-16 18:33 ` Ulrich Drepper
2009-02-16 21:04 ` Roland McGrath
0 siblings, 2 replies; 3+ messages in thread
From: Jakub Jelinek @ 2009-02-16 14:56 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
While looking at gthr*.h non-uglified parameter names that caused
#define thread
#include <string>
failures in gcc 4.4, I've hacked up g++ a little bit to report
non-uglified parameters and local variable names.
This patch fixes what it found in glibc.
Ok to commit?
2009-02-16 Jakub Jelinek <jakub@redhat.com>
* stdlib/monetary.h: Uglify function parameter names.
* sunrpc/rpc/pmap_clnt.h: Likewise.
* sunrpc/rpc/svc.h: Likewise.
* sunrpc/rpc/xdr.h: Likewise.
* sunrpc/rpc/clnt.h: Likewise.
* resolv/netdb.h: Likewise.
* resolv/arpa/nameser.h: Likewise.
* resolv/resolv.h: Likewise.
* argp/argp.h: Likewise.
* locale/langinfo.h: Likewise.
* io/sys/stat.h: Likewise.
* posix/spawn.h: Likewise.
* nis/rpcsvc/nislib.h: Likewise.
* malloc/obstack.h: Likewise.
* sysdeps/ia64/bits/link.h: Likewise.
* sysdeps/i386/bits/link.h: Likewise.
* sysdeps/s390/bits/link.h: Likewise.
* sysdeps/powerpc/bits/link.h: Likewise.
* sysdeps/x86_64/bits/link.h: Likewise.
* sysdeps/sparc/bits/link.h: Likewise.
* sysdeps/sh/bits/link.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/eventfd.h: Likewise.
* sysdeps/unix/sysv/linux/sys/eventfd.h: Likewise.
--- libc/stdlib/monetary.h.jj 2006-01-14 13:08:37.000000000 +0100
+++ libc/stdlib/monetary.h 2009-02-16 14:54:01.000000000 +0100
@@ -1,5 +1,5 @@
/* Header file for monetary value formatting functions.
- Copyright (C) 1996,1997,1998,1999,2000,2002,2006
+ Copyright (C) 1996,1997,1998,1999,2000,2002,2006,2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -46,7 +46,7 @@ extern ssize_t strfmon (char *__restrict
/* Formatting a monetary value according to the current locale. */
extern ssize_t strfmon_l (char *__restrict __s, size_t __maxsize,
- __locale_t loc,
+ __locale_t __loc,
__const char *__restrict __format, ...)
__THROW __attribute_format_strfmon__ (4, 5);
#endif
--- libc/sunrpc/rpc/pmap_clnt.h.jj 1999-10-09 23:25:34.000000000 +0200
+++ libc/sunrpc/rpc/pmap_clnt.h 2009-02-16 15:01:47.000000000 +0100
@@ -45,7 +45,7 @@
__BEGIN_DECLS
-typedef bool_t (*resultproc_t) (caddr_t resp, struct sockaddr_in *raddr);
+typedef bool_t (*resultproc_t) (caddr_t __resp, struct sockaddr_in *__raddr);
/*
* Usage:
--- libc/sunrpc/rpc/svc.h.jj 2008-10-11 10:43:36.000000000 +0200
+++ libc/sunrpc/rpc/svc.h 2009-02-16 15:02:19.000000000 +0100
@@ -82,11 +82,11 @@ struct SVCXPRT {
enum xprt_stat (*xp_stat) (SVCXPRT *__xprt);
/* get transport status */
bool_t (*xp_getargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
- caddr_t args_ptr); /* get arguments */
+ caddr_t __args_ptr); /* get arguments */
bool_t (*xp_reply) (SVCXPRT *__xprt, struct rpc_msg *__msg);
/* send reply */
bool_t (*xp_freeargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
- caddr_t args_ptr);
+ caddr_t __args_ptr);
/* free mem allocated for args */
void (*xp_destroy) (SVCXPRT *__xprt);
/* destroy this struct */
@@ -226,7 +226,7 @@ extern void xprt_unregister (SVCXPRT *__
* deadlock the caller and server processes!
*/
-extern bool_t svc_sendreply (SVCXPRT *xprt, xdrproc_t __xdr_results,
+extern bool_t svc_sendreply (SVCXPRT *__xprt, xdrproc_t __xdr_results,
caddr_t __xdr_location) __THROW;
extern void svcerr_decode (SVCXPRT *__xprt) __THROW;
--- libc/sunrpc/rpc/xdr.h.jj 2004-09-28 04:56:46.000000000 +0200
+++ libc/sunrpc/rpc/xdr.h 2009-02-16 15:11:01.000000000 +0100
@@ -316,7 +316,7 @@ extern bool_t xdr_opaque (XDR *__xdrs, c
extern bool_t xdr_string (XDR *__xdrs, char **__cpp, u_int __maxsize) __THROW;
extern bool_t xdr_union (XDR *__xdrs, enum_t *__dscmp, char *__unp,
__const struct xdr_discrim *__choices,
- xdrproc_t dfault) __THROW;
+ xdrproc_t __dfault) __THROW;
extern bool_t xdr_char (XDR *__xdrs, char *__cp) __THROW;
extern bool_t xdr_u_char (XDR *__xdrs, u_char *__cp) __THROW;
extern bool_t xdr_vector (XDR *__xdrs, char *__basep, u_int __nelem,
--- libc/sunrpc/rpc/clnt.h.jj 2003-08-30 23:52:27.000000000 +0200
+++ libc/sunrpc/rpc/clnt.h 2009-02-16 15:01:21.000000000 +0100
@@ -405,7 +405,7 @@ extern char *clnt_sperrno (enum clnt_sta
* get the port number on the host for the rpc program,version and proto
*/
extern int getrpcport (__const char * __host, u_long __prognum,
- u_long __versnum, u_int proto) __THROW;
+ u_long __versnum, u_int __proto) __THROW;
/*
* get the local host's IP address without consulting
--- libc/resolv/netdb.h.jj 2008-03-04 10:54:29.000000000 +0100
+++ libc/resolv/netdb.h 2009-02-16 14:54:41.000000000 +0100
@@ -1,4 +1,4 @@
- /* Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
+ /* Copyright (C) 1996-2002, 2003, 2004, 2009 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
@@ -421,7 +421,7 @@ extern int getnetgrent (char **__restric
or due to the implementation it is a cancellation point and
therefore not marked with __THROW. */
extern int innetgr (__const char *__netgroup, __const char *__host,
- __const char *__user, __const char *domain);
+ __const char *__user, __const char *__domain);
/* Reentrant version of `getnetgrent' where result is placed in BUFFER.
--- libc/resolv/arpa/nameser.h.jj 2008-08-13 14:03:18.000000000 +0200
+++ libc/resolv/arpa/nameser.h 2009-02-16 14:49:13.000000000 +0100
@@ -487,7 +487,7 @@ int ns_sprintrrf (const u_char *, size_
char *, size_t) __THROW;
int ns_format_ttl (u_long, char *, size_t) __THROW;
int ns_parse_ttl (const char *, u_long *) __THROW;
-u_int32_t ns_datetosecs (const char *cp, int *errp) __THROW;
+u_int32_t ns_datetosecs (const char *, int *) __THROW;
int ns_name_ntol (const u_char *, u_char *, size_t) __THROW;
int ns_name_ntop (const u_char *, char *, size_t) __THROW;
int ns_name_pton (const char *, u_char *, size_t) __THROW;
--- libc/resolv/resolv.h.jj 2007-06-29 10:19:57.000000000 +0200
+++ libc/resolv/resolv.h 2009-02-16 15:00:56.000000000 +0100
@@ -71,19 +71,19 @@
typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
res_sendhookact;
-typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *ns,
- const u_char **query,
- int *querylen,
- u_char *ans,
- int anssiz,
- int *resplen);
-
-typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *ns,
- const u_char *query,
- int querylen,
- u_char *ans,
- int anssiz,
- int *resplen);
+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns,
+ const u_char **__query,
+ int *__querylen,
+ u_char *__ans,
+ int __anssiz,
+ int *__resplen);
+
+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns,
+ const u_char *__query,
+ int __querylen,
+ u_char *__ans,
+ int __anssiz,
+ int *__resplen);
/*
* Global defines and variables for resolver stub.
@@ -328,8 +328,8 @@ const char * sym_ntos (const struct res_
const char * sym_ntop (const struct res_sym *, int, int *) __THROW;
int b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
int b64_pton (char const *, u_char *, size_t) __THROW;
-int loc_aton (const char *ascii, u_char *binary) __THROW;
-const char * loc_ntoa (const u_char *binary, char *ascii) __THROW;
+int loc_aton (const char *__ascii, u_char *__binary) __THROW;
+const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
int dn_skipname (const u_char *, const u_char *) __THROW;
void putlong (u_int32_t, u_char *) __THROW;
void putshort (u_int16_t, u_char *) __THROW;
@@ -340,10 +340,10 @@ const char * p_rcode (int) __THROW;
const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *)
__THROW;
const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW;
-const u_char * p_fqnname (const u_char *cp, const u_char *msg,
+const u_char * p_fqnname (const u_char *__cp, const u_char *__msg,
int, char *, int) __THROW;
const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW;
-const char * p_option (u_long option) __THROW;
+const char * p_option (u_long __option) __THROW;
char * p_secstodate (u_long) __THROW;
int dn_count_labels (const char *) __THROW;
int dn_comp (const char *, u_char *, int, u_char **, u_char **)
@@ -355,7 +355,7 @@ int res_nameinquery (const char *, int,
const u_char *, const u_char *) __THROW;
int res_queriesmatch (const u_char *, const u_char *,
const u_char *, const u_char *) __THROW;
-const char * p_section (int section, int opcode) __THROW;
+const char * p_section (int __section, int __opcode) __THROW;
/* Things involving a resolver context. */
int res_ninit (res_state) __THROW;
int res_nisourserver (const res_state,
--- libc/argp/argp.h.jj 2007-03-21 21:22:15.000000000 +0100
+++ libc/argp/argp.h 2009-02-16 14:48:31.000000000 +0100
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing, layered over getopt.
- Copyright (C) 1995-1999, 2003, 2004, 2005, 2006, 2007
+ Copyright (C) 1995-1999, 2003, 2004, 2005, 2006, 2007, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -150,8 +150,8 @@ struct argp_state; /* " */
struct argp_child; /* " */
/* The type of a pointer to an argp parsing function. */
-typedef error_t (*argp_parser_t) (int key, char *arg,
- struct argp_state *state);
+typedef error_t (*argp_parser_t) (int __key, char *__arg,
+ struct argp_state *__state);
/* What to return for unrecognized keys. For special ARGP_KEY_ keys, such
returns will simply be ignored. For user keys, this error will be turned
--- libc/locale/langinfo.h.jj 2005-03-28 21:22:05.000000000 +0200
+++ libc/locale/langinfo.h 2009-02-16 14:53:15.000000000 +0100
@@ -1,5 +1,5 @@
/* Access to locale-dependent parameters.
- Copyright (C) 1995-2002,2003,2004,2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2002,2003,2004,2005,2009 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
@@ -590,7 +590,7 @@ extern char *nl_langinfo (nl_item __item
# include <xlocale.h>
/* Just like nl_langinfo but get the information from the locale object L. */
-extern char *nl_langinfo_l (nl_item __item, __locale_t l);
+extern char *nl_langinfo_l (nl_item __item, __locale_t __l);
#endif
__END_DECLS
--- libc/io/sys/stat.h.jj 2007-09-15 17:18:46.000000000 +0200
+++ libc/io/sys/stat.h 2009-02-16 15:28:39.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007
+/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -298,7 +298,8 @@ extern int fchmod (int __fd, __mode_t __
#ifdef __USE_ATFILE
/* Set file access permissions of FILE relative to
the directory FD is open on. */
-extern int fchmodat (int __fd, __const char *__file, __mode_t mode, int __flag)
+extern int fchmodat (int __fd, __const char *__file, __mode_t __mode,
+ int __flag)
__THROW __nonnull ((2)) __wur;
#endif /* Use ATFILE. */
--- libc/posix/spawn.h.jj 2004-09-12 20:04:02.000000000 +0200
+++ libc/posix/spawn.h 2009-02-16 15:19:23.000000000 +0100
@@ -1,5 +1,5 @@
/* Definitions for POSIX spawn interface.
- Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2003, 2004, 2009 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
@@ -74,8 +74,8 @@ extern int posix_spawn (pid_t *__restric
__const posix_spawn_file_actions_t *__restrict
__file_actions,
__const posix_spawnattr_t *__restrict __attrp,
- char *__const argv[__restrict_arr],
- char *__const envp[__restrict_arr]);
+ char *__const __argv[__restrict_arr],
+ char *__const __envp[__restrict_arr]);
/* Similar to `posix_spawn' but search for FILE in the PATH.
@@ -84,7 +84,7 @@ extern int posix_spawn (pid_t *__restric
extern int posix_spawnp (pid_t *__pid, __const char *__file,
__const posix_spawn_file_actions_t *__file_actions,
__const posix_spawnattr_t *__attrp,
- char *__const argv[], char *__const envp[]);
+ char *__const __argv[], char *__const __envp[]);
/* Initialize data structure with attributes for `spawn' to default values. */
--- libc/nis/rpcsvc/nislib.h.jj 2007-03-21 21:23:53.000000000 +0100
+++ libc/nis/rpcsvc/nislib.h 2009-02-16 15:10:06.000000000 +0100
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2006, 2007, 2009
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
@@ -111,59 +112,59 @@ extern nis_result *nis_modify (const_nis
* const netobj *cookie: The value of cookie from the nis_result structure
* form the previous call.
*/
-extern nis_result *nis_list (const_nis_name name, unsigned int flags,
- int (*callback)(const_nis_name table_name,
- const nis_object *obj,
- const void *userdata),
- const void *userdata) __THROW;
-extern nis_result *nis_add_entry (const_nis_name table_name,
- const nis_object *obj,
- unsigned int flags) __THROW;
-extern nis_result *nis_modify_entry (const_nis_name name,
- const nis_object *obj,
- unsigned int flags) __THROW;
-extern nis_result *nis_remove_entry (const_nis_name table_name,
- const nis_object *obj,
- unsigned int flags) __THROW;
-extern nis_result *nis_first_entry (const_nis_name table_name) __THROW;
-extern nis_result *nis_next_entry (const_nis_name table_name,
- const netobj *cookie) __THROW;
+extern nis_result *nis_list (const_nis_name __name, unsigned int __flags,
+ int (*__callback)(const_nis_name __table_name,
+ const nis_object *__obj,
+ const void *__userdata),
+ const void *__userdata) __THROW;
+extern nis_result *nis_add_entry (const_nis_name __table_name,
+ const nis_object *__obj,
+ unsigned int __flags) __THROW;
+extern nis_result *nis_modify_entry (const_nis_name __name,
+ const nis_object *__obj,
+ unsigned int __flags) __THROW;
+extern nis_result *nis_remove_entry (const_nis_name __table_name,
+ const nis_object *__obj,
+ unsigned int __flags) __THROW;
+extern nis_result *nis_first_entry (const_nis_name __table_name) __THROW;
+extern nis_result *nis_next_entry (const_nis_name __table_name,
+ const netobj *__cookie) __THROW;
/*
** nis_server
*/
-extern nis_error nis_mkdir (const_nis_name dirname,
- const nis_server *machine) __THROW;
-extern nis_error nis_rmdir (const_nis_name dirname,
- const nis_server *machine) __THROW;
-extern nis_error nis_servstate (const nis_server *machine,
- const nis_tag *tags, int numtags,
- nis_tag **result) __THROW;
-extern nis_error nis_stats (const nis_server *machine,
- const nis_tag *tags, int numtags,
- nis_tag **result) __THROW;
-extern void nis_freetags (nis_tag *tags, int numtags) __THROW;
-extern nis_server **nis_getservlist (const_nis_name dirname) __THROW;
-extern void nis_freeservlist (nis_server **machines) __THROW;
+extern nis_error nis_mkdir (const_nis_name __dirname,
+ const nis_server *__machine) __THROW;
+extern nis_error nis_rmdir (const_nis_name __dirname,
+ const nis_server *__machine) __THROW;
+extern nis_error nis_servstate (const nis_server *__machine,
+ const nis_tag *__tags, int __numtags,
+ nis_tag **__result) __THROW;
+extern nis_error nis_stats (const nis_server *__machine,
+ const nis_tag *__tags, int __numtags,
+ nis_tag **__result) __THROW;
+extern void nis_freetags (nis_tag *__tags, int __numtags) __THROW;
+extern nis_server **nis_getservlist (const_nis_name __dirname) __THROW;
+extern void nis_freeservlist (nis_server **__machines) __THROW;
/*
** nis_subr
*/
-extern nis_name nis_leaf_of (const_nis_name name) __THROW;
-extern nis_name nis_leaf_of_r (const_nis_name name, char *buffer,
- size_t buflen) __THROW;
-extern nis_name nis_name_of (const_nis_name name) __THROW;
-extern nis_name nis_name_of_r (const_nis_name name, char *buffer,
- size_t buflen) __THROW;
-extern nis_name nis_domain_of (const_nis_name name) __THROW;
-extern nis_name nis_domain_of_r (const_nis_name name, char *buffer,
- size_t buflen) __THROW;
-extern nis_name *nis_getnames (const_nis_name name) __THROW;
-extern void nis_freenames (nis_name *namelist) __THROW;
-extern name_pos nis_dir_cmp (const_nis_name n1, const_nis_name n2) __THROW;
-extern nis_object *nis_clone_object (const nis_object *src,
- nis_object *dest) __THROW;
-extern void nis_destroy_object (nis_object *obj) __THROW;
-extern void nis_print_object (const nis_object *obj) __THROW;
+extern nis_name nis_leaf_of (const_nis_name __name) __THROW;
+extern nis_name nis_leaf_of_r (const_nis_name __name, char *__buffer,
+ size_t __buflen) __THROW;
+extern nis_name nis_name_of (const_nis_name __name) __THROW;
+extern nis_name nis_name_of_r (const_nis_name __name, char *__buffer,
+ size_t __buflen) __THROW;
+extern nis_name nis_domain_of (const_nis_name __name) __THROW;
+extern nis_name nis_domain_of_r (const_nis_name __name, char *__buffer,
+ size_t __buflen) __THROW;
+extern nis_name *nis_getnames (const_nis_name __name) __THROW;
+extern void nis_freenames (nis_name *__namelist) __THROW;
+extern name_pos nis_dir_cmp (const_nis_name __n1, const_nis_name __n2) __THROW;
+extern nis_object *nis_clone_object (const nis_object *__src,
+ nis_object *__dest) __THROW;
+extern void nis_destroy_object (nis_object *__obj) __THROW;
+extern void nis_print_object (const nis_object *__obj) __THROW;
/*
** nis_local_names
@@ -176,67 +177,67 @@ extern nis_name nis_local_host (void) __
/*
** nis_error
*/
-extern const char *nis_sperrno (const nis_error status) __THROW;
-extern void nis_perror (const nis_error status, const char *label) __THROW;
-extern void nis_lerror (const nis_error status, const char *label) __THROW;
-extern char *nis_sperror (const nis_error status, const char *label) __THROW;
-extern char *nis_sperror_r (const nis_error status, const char *label,
- char *buffer, size_t buflen) __THROW;
+extern const char *nis_sperrno (const nis_error __status) __THROW;
+extern void nis_perror (const nis_error __status, const char *__label) __THROW;
+extern void nis_lerror (const nis_error __status, const char *__label) __THROW;
+extern char *nis_sperror (const nis_error status, const char *__label) __THROW;
+extern char *nis_sperror_r (const nis_error __status, const char *__label,
+ char *__buffer, size_t __buflen) __THROW;
/*
** nis_groups
*/
-extern bool_t nis_ismember (const_nis_name principal,
- const_nis_name group) __THROW;
-extern nis_error nis_addmember (const_nis_name member,
- const_nis_name group) __THROW;
-extern nis_error nis_removemember (const_nis_name member,
- const_nis_name group) __THROW;
-extern nis_error nis_creategroup (const_nis_name group,
- unsigned int flags) __THROW;
-extern nis_error nis_destroygroup (const_nis_name group) __THROW;
-extern void nis_print_group_entry (const_nis_name group) __THROW;
-extern nis_error nis_verifygroup (const_nis_name group) __THROW;
+extern bool_t nis_ismember (const_nis_name __principal,
+ const_nis_name __group) __THROW;
+extern nis_error nis_addmember (const_nis_name __member,
+ const_nis_name __group) __THROW;
+extern nis_error nis_removemember (const_nis_name __member,
+ const_nis_name __group) __THROW;
+extern nis_error nis_creategroup (const_nis_name __group,
+ unsigned int __flags) __THROW;
+extern nis_error nis_destroygroup (const_nis_name __group) __THROW;
+extern void nis_print_group_entry (const_nis_name __group) __THROW;
+extern nis_error nis_verifygroup (const_nis_name __group) __THROW;
/*
** nis_ping
*/
-extern void nis_ping (const_nis_name dirname, uint32_t utime,
- const nis_object *dirobj) __THROW;
-extern nis_result *nis_checkpoint (const_nis_name dirname) __THROW;
+extern void nis_ping (const_nis_name __dirname, uint32_t __utime,
+ const nis_object *__dirobj) __THROW;
+extern nis_result *nis_checkpoint (const_nis_name __dirname) __THROW;
/*
** nis_print (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
-extern void nis_print_result (const nis_result *result) __THROW;
-extern void nis_print_rights (unsigned int rights) __THROW;
-extern void nis_print_directory (const directory_obj *dirobj) __THROW;
-extern void nis_print_group (const group_obj *grpobj) __THROW;
-extern void nis_print_table (const table_obj *tblobj) __THROW;
-extern void nis_print_link (const link_obj *lnkobj) __THROW;
-extern void nis_print_entry (const entry_obj *enobj) __THROW;
+extern void nis_print_result (const nis_result *__result) __THROW;
+extern void nis_print_rights (unsigned int __rights) __THROW;
+extern void nis_print_directory (const directory_obj *__dirobj) __THROW;
+extern void nis_print_group (const group_obj *__grpobj) __THROW;
+extern void nis_print_table (const table_obj *__tblobj) __THROW;
+extern void nis_print_link (const link_obj *__lnkobj) __THROW;
+extern void nis_print_entry (const entry_obj *__enobj) __THROW;
/*
** nis_file (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
extern directory_obj *readColdStartFile (void) __THROW;
-extern bool_t writeColdStartFile (const directory_obj *dirobj) __THROW;
-extern nis_object *nis_read_obj (const char *obj) __THROW;
-extern bool_t nis_write_obj (const char *file, const nis_object *obj) __THROW;
+extern bool_t writeColdStartFile (const directory_obj *__dirobj) __THROW;
+extern nis_object *nis_read_obj (const char *__obj) __THROW;
+extern bool_t nis_write_obj (const char *__file, const nis_object *__obj) __THROW;
/*
** nis_clone - (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
-extern directory_obj *nis_clone_directory (const directory_obj *src,
- directory_obj *dest) __THROW;
-extern nis_result *nis_clone_result (const nis_result *src,
- nis_result *dest) __THROW;
+extern directory_obj *nis_clone_directory (const directory_obj *__src,
+ directory_obj *__dest) __THROW;
+extern nis_result *nis_clone_result (const nis_result *__src,
+ nis_result *__dest) __THROW;
/* nis_free - nis_freeresult */
-extern void nis_freeresult (nis_result *result) __THROW;
+extern void nis_freeresult (nis_result *__result) __THROW;
/* (XXX THE FOLLOWING ARE INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
-extern void nis_free_request (ib_request *req) __THROW;
-extern void nis_free_directory (directory_obj *dirobj) __THROW;
-extern void nis_free_object (nis_object *obj) __THROW;
+extern void nis_free_request (ib_request *__req) __THROW;
+extern void nis_free_directory (directory_obj *__dirobj) __THROW;
+extern void nis_free_object (nis_object *__obj) __THROW;
/* (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
extern nis_name __nis_default_owner (char *) __THROW;
@@ -245,7 +246,7 @@ extern uint32_t __nis_default_ttl (char
extern unsigned int __nis_default_access (char *, unsigned int) __THROW;
extern fd_result *__nis_finddirectory (directory_obj *, const_nis_name) __THROW;
extern void __free_fdresult (fd_result *) __THROW;
-extern uint32_t __nis_hash (const void *keyarg, register size_t len) __THROW;
+extern uint32_t __nis_hash (const void *__keyarg, size_t __len) __THROW;
/* NIS+ cache locking */
extern int __nis_lock_cache (void) __THROW;
--- libc/malloc/obstack.h.jj 2006-01-11 06:42:41.000000000 +0100
+++ libc/malloc/obstack.h 2009-02-16 14:55:19.000000000 +0100
@@ -1,5 +1,5 @@
/* obstack.h - object stack macros
- Copyright (C) 1988-1994,1996-1999,2003,2004,2005
+ Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -187,7 +187,7 @@ extern int _obstack_begin_1 (struct obst
void (*) (void *, void *), void *);
extern int _obstack_memory_used (struct obstack *);
-void obstack_free (struct obstack *obstack, void *block);
+void obstack_free (struct obstack *__obstack, void *__block);
\f
/* Error handler called when `obstack_chunk_alloc' failed to allocate
--- libc/sysdeps/ia64/bits/link.h.jj 2005-01-29 05:12:07.000000000 +0100
+++ libc/sysdeps/ia64/bits/link.h 2009-02-16 14:50:52.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009 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
@@ -58,6 +58,6 @@ extern unsigned int la_ia64_gnu_pltexit
uintptr_t *__defcook,
const La_ia64_regs *__inregs,
La_ia64_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/i386/bits/link.h.jj 2005-01-06 23:40:17.000000000 +0100
+++ libc/sysdeps/i386/bits/link.h 2009-02-16 14:50:29.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2009 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
@@ -55,6 +55,6 @@ extern unsigned int la_i86_gnu_pltexit (
uintptr_t *__defcook,
const La_i86_regs *__inregs,
La_i86_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/s390/bits/link.h.jj 2005-01-29 01:00:27.000000000 +0100
+++ libc/sysdeps/s390/bits/link.h 2009-02-16 14:51:21.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009 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
@@ -104,7 +104,7 @@ extern unsigned int la_s390_64_gnu_pltex
uintptr_t *__defcook,
const La_s390_64_regs *__inregs,
La_s390_64_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/powerpc/bits/link.h.jj 2005-03-19 03:47:55.000000000 +0100
+++ libc/sysdeps/powerpc/bits/link.h 2009-02-16 14:52:36.000000000 +0100
@@ -1,5 +1,5 @@
/* Machine-specific declarations for dynamic linker interface. PowerPC version
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2009 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
@@ -60,7 +60,7 @@ extern unsigned int la_ppc32_gnu_pltexit
uintptr_t *__defcook,
const La_ppc32_regs *__inregs,
La_ppc32_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
@@ -104,7 +104,7 @@ extern unsigned int la_ppc64_gnu_pltexit
uintptr_t *__defcook,
const La_ppc64_regs *__inregs,
La_ppc64_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/x86_64/bits/link.h.jj 2005-01-23 05:50:01.000000000 +0100
+++ libc/sysdeps/x86_64/bits/link.h 2009-02-16 14:50:06.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2009 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
@@ -110,7 +110,7 @@ extern unsigned int la_x86_64_gnu_pltexi
uintptr_t *__defcook,
const La_x86_64_regs *__inregs,
La_x86_64_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/sparc/bits/link.h.jj 2005-04-05 23:36:52.000000000 +0200
+++ libc/sysdeps/sparc/bits/link.h 2009-02-16 14:52:03.000000000 +0100
@@ -1,5 +1,5 @@
/* Machine-specific audit interfaces for dynamic linker. SPARC version.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009 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
@@ -75,7 +75,7 @@ extern unsigned int la_sparc32_gnu_pltex
uintptr_t *__defcook,
const La_sparc32_regs *__inregs,
La_sparc32_retval *__outregs,
- const char *symname);
+ const char *__symname);
#else
@@ -93,7 +93,7 @@ extern unsigned int la_sparc64_gnu_pltex
uintptr_t *__defcook,
const La_sparc64_regs *__inregs,
La_sparc64_retval *__outregs,
- const char *symname);
+ const char *__symname);
#endif
--- libc/sysdeps/sh/bits/link.h.jj 2005-01-12 03:54:10.000000000 +0100
+++ libc/sysdeps/sh/bits/link.h 2009-02-16 14:51:39.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2009 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
@@ -65,6 +65,6 @@ extern unsigned int la_sh_gnu_pltexit (E
uintptr_t *__defcook,
const La_sh_regs *__inregs,
La_sh_retval *__outregs,
- const char *symname);
+ const char *__symname);
__END_DECLS
--- libc/sysdeps/unix/sysv/linux/i386/sys/io.h.jj 2001-07-06 06:56:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/sys/io.h 2009-02-16 15:27:37.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2000, 2009 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
@@ -41,138 +41,142 @@ extern int iopl (int __level) __THROW;
#if defined __GNUC__ && __GNUC__ >= 2
static __inline unsigned char
-inb (unsigned short int port)
+inb (unsigned short int __port)
{
unsigned char _v;
- __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned char
-inb_p (unsigned short int port)
+inb_p (unsigned short int __port)
{
unsigned char _v;
- __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned short int
-inw (unsigned short int port)
+inw (unsigned short int __port)
{
unsigned short _v;
- __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned short int
-inw_p (unsigned short int port)
+inw_p (unsigned short int __port)
{
unsigned short int _v;
- __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned int
-inl (unsigned short int port)
+inl (unsigned short int __port)
{
unsigned int _v;
- __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned int
-inl_p (unsigned short int port)
+inl_p (unsigned short int __port)
{
unsigned int _v;
- __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v)
+ :"Nd" (__port));
return _v;
}
static __inline void
-outb (unsigned char value, unsigned short int port)
+outb (unsigned char value, unsigned short int __port)
{
- __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (__port));
}
static __inline void
-outb_p (unsigned char value, unsigned short int port)
+outb_p (unsigned char value, unsigned short int __port)
{
__asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ "Nd" (__port));
}
static __inline void
-outw (unsigned short int value, unsigned short int port)
+outw (unsigned short int value, unsigned short int __port)
{
- __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (__port));
}
static __inline void
-outw_p (unsigned short int value, unsigned short int port)
+outw_p (unsigned short int value, unsigned short int __port)
{
__asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ "Nd" (__port));
}
static __inline void
-outl (unsigned int value, unsigned short int port)
+outl (unsigned int value, unsigned short int __port)
{
- __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (__port));
}
static __inline void
-outl_p (unsigned int value, unsigned short int port)
+outl_p (unsigned int value, unsigned short int __port)
{
__asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ "Nd" (__port));
}
static __inline void
-insb (unsigned short int port, void *addr, unsigned long int count)
+insb (unsigned short int __port, void *__addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insb":"=D" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
static __inline void
-insw (unsigned short int port, void *addr, unsigned long int count)
+insw (unsigned short int __port, void *__addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insw":"=D" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
static __inline void
-insl (unsigned short int port, void *addr, unsigned long int count)
+insl (unsigned short int __port, void *__addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insl":"=D" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
static __inline void
-outsb (unsigned short int port, const void *addr, unsigned long int count)
+outsb (unsigned short int __port, const void *__addr,
+ unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
static __inline void
-outsw (unsigned short int port, const void *addr, unsigned long int count)
+outsw (unsigned short int __port, const void *__addr,
+ unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
static __inline void
-outsl (unsigned short int port, const void *addr, unsigned long int count)
+outsl (unsigned short int __port, const void *__addr,
+ unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (__addr), "=c" (__count)
+ :"d" (__port), "0" (__addr), "1" (__count));
}
#endif /* GNU C */
--- libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h.jj 2002-05-09 10:07:05.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h 2009-02-16 15:25:06.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2000, 2002, 2009 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
@@ -41,138 +41,138 @@ extern int iopl (int __level) __THROW;
#if defined __GNUC__ && __GNUC__ >= 2
static __inline unsigned char
-inb (unsigned short int port)
+inb (unsigned short int __port)
{
unsigned char _v;
- __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned char
-inb_p (unsigned short int port)
+inb_p (unsigned short int __port)
{
unsigned char _v;
- __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned short int
-inw (unsigned short int port)
+inw (unsigned short int __port)
{
unsigned short _v;
- __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned short int
-inw_p (unsigned short int port)
+inw_p (unsigned short int __port)
{
unsigned short int _v;
- __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned int
-inl (unsigned short int port)
+inl (unsigned short int __port)
{
unsigned int _v;
- __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline unsigned int
-inl_p (unsigned short int port)
+inl_p (unsigned short int __port)
{
unsigned int _v;
- __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
+ __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
return _v;
}
static __inline void
-outb (unsigned char value, unsigned short int port)
+outb (unsigned char __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outb %b0,%w1": :"a" (__value), "Nd" (__port));
}
static __inline void
-outb_p (unsigned char value, unsigned short int port)
+outb_p (unsigned char __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (__value),
+ "Nd" (__port));
}
static __inline void
-outw (unsigned short int value, unsigned short int port)
+outw (unsigned short int __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outw %w0,%w1": :"a" (__value), "Nd" (__port));
}
static __inline void
-outw_p (unsigned short int value, unsigned short int port)
+outw_p (unsigned short int __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (__value),
+ "Nd" (__port));
}
static __inline void
-outl (unsigned int value, unsigned short int port)
+outl (unsigned int __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port));
+ __asm__ __volatile__ ("outl %0,%w1": :"a" (__value), "Nd" (__port));
}
static __inline void
-outl_p (unsigned int value, unsigned short int port)
+outl_p (unsigned int __value, unsigned short int __port)
{
- __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (value),
- "Nd" (port));
+ __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (__value),
+ "Nd" (__port));
}
static __inline void
-insb (unsigned short int port, void *addr, unsigned long int count)
+insb (unsigned short int __port, void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
static __inline void
-insw (unsigned short int port, void *addr, unsigned long int count)
+insw (unsigned short int __port, void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
static __inline void
-insl (unsigned short int port, void *addr, unsigned long int count)
+insl (unsigned short int __port, void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
static __inline void
-outsb (unsigned short int port, const void *addr, unsigned long int count)
+outsb (unsigned short int __port, const void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
static __inline void
-outsw (unsigned short int port, const void *addr, unsigned long int count)
+outsw (unsigned short int __port, const void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
static __inline void
-outsl (unsigned short int port, const void *addr, unsigned long int count)
+outsl (unsigned short int __port, const void *addr, unsigned long int __count)
{
- __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr),
- "=c" (count):"d" (port), "0" (addr), "1" (count));
+ __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), "=c" (__count)
+ :"d" (__port), "0" (addr), "1" (__count));
}
#endif /* GNU C */
--- libc/sysdeps/unix/sysv/linux/sparc/sys/eventfd.h.jj 2008-07-25 06:47:57.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/sys/eventfd.h 2009-02-16 15:20:32.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2007, 2008, 2009 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
@@ -45,7 +45,7 @@ extern int eventfd (int __count, int __f
extern int eventfd_read (int __fd, eventfd_t *__value);
/* Increment event counter. */
-extern int eventfd_write (int __fd, eventfd_t value);
+extern int eventfd_write (int __fd, eventfd_t __value);
__END_DECLS
--- libc/sysdeps/unix/sysv/linux/sys/eventfd.h.jj 2008-08-13 14:03:31.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sys/eventfd.h 2009-02-16 15:19:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2007, 2008, 2009 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
@@ -45,7 +45,7 @@ extern int eventfd (int __count, int __f
extern int eventfd_read (int __fd, eventfd_t *__value);
/* Increment event counter. */
-extern int eventfd_write (int __fd, eventfd_t value);
+extern int eventfd_write (int __fd, eventfd_t __value);
__END_DECLS
Jakub
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-16 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-16 14:56 [PATCH] Uglify function parameter names in installed headers Jakub Jelinek
2009-02-16 18:33 ` Ulrich Drepper
2009-02-16 21:04 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).