summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--include/netdb.h7
-rw-r--r--include/netinet/ether.h2
-rw-r--r--include/rpc/netdb.h2
-rw-r--r--nss/nss_files/files-netgrp.c1
-rw-r--r--nss/nss_files/files-parse.c4
6 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index ed1ddb7875..d127766c73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-10-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/libc-symbols.h: Define hidden attribute macros for
+	libnss_files.
+	* include/netdb.h: Use libnss_files_hidden_proto for the parsers
+	defined in libnss_files, not libc_hidden_proto.
+	* include/netinet/ether.h: Likewise.
+	* include/rpc/netdb.h: Likewise.
+	* nss/nss_files/files-parse.c: Use hidden_def in parser definitions
+	instead of libc_hidden_def.
+	* nss/nss_files/files-netgrp.c: Add libnss_files_hidden_def to
+	_nss_netgroup_parseline definition.
+
 2004-10-23  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Don't return early
diff --git a/include/netdb.h b/include/netdb.h
index e8f28e8c67..0bf84c21c0 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -202,9 +202,10 @@ extern enum nss_status _nss_netgroup_parseline (char **cursor,
 						struct __netgrent *result,
 						char *buffer, size_t buflen,
 						int *errnop);
-libc_hidden_proto (_nss_files_parse_protoent)
-libc_hidden_proto (_nss_files_parse_servent)
-libc_hidden_proto (_nss_files_parse_netent)
+libnss_files_hidden_proto (_nss_files_parse_protoent)
+libnss_files_hidden_proto (_nss_files_parse_servent)
+libnss_files_hidden_proto (_nss_files_parse_netent)
+libnss_files_hidden_proto (_nss_netgroup_parseline)
 
 #define DECLARE_NSS_PROTOTYPES(service)					      \
 extern enum nss_status _nss_ ## service ## _setprotoent (int);		      \
diff --git a/include/netinet/ether.h b/include/netinet/ether.h
index 2a9efae0bf..2efe4c04e4 100644
--- a/include/netinet/ether.h
+++ b/include/netinet/ether.h
@@ -17,7 +17,7 @@ struct parser_data;
 extern int _nss_files_parse_etherent (char *line, struct etherent *result,
 				      struct parser_data *data,
 				      size_t datalen, int *errnop);
-libc_hidden_proto (_nss_files_parse_etherent)
+libnss_files_hidden_proto (_nss_files_parse_etherent)
 
 #define DECLARE_NSS_PROTOTYPES(service)					      \
 extern enum nss_status _nss_ ## service ## _setetherent (int __stayopen);     \
diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h
index ad7cff1a6e..f7021e7aba 100644
--- a/include/rpc/netdb.h
+++ b/include/rpc/netdb.h
@@ -26,7 +26,7 @@ struct parser_data;
 extern int _nss_files_parse_rpcent (char *line, struct rpcent *result,
 				    struct parser_data *data,
 				    size_t datalen, int *errnop);
-libc_hidden_proto (_nss_files_parse_rpcent)
+libnss_files_hidden_proto (_nss_files_parse_rpcent)
 
 #define DECLARE_NSS_PROTOTYPES(service)					      \
 extern enum nss_status _nss_ ## service ## _setrpcent (int);		      \
diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c
index e207691996..8bdc68bd14 100644
--- a/nss/nss_files/files-netgrp.c
+++ b/nss/nss_files/files-netgrp.c
@@ -274,6 +274,7 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result,
 
   return status;
 }
+libnss_files_hidden_def (_nss_netgroup_parseline)
 
 
 enum nss_status
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
index 7d1e2326d3..0bc15f71de 100644
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -1,5 +1,5 @@
 /* Common code for file-based database parsers in nss_files module.
-   Copyright (C) 1996-2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1996-2000, 2003, 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
@@ -73,7 +73,7 @@ struct parser_data
 /* Export the line parser function so it can be used in nss_db.  */
 # define parser_stclass /* Global */
 # define parse_line CONCAT(_nss_files_parse_,ENTNAME)
-# define nss_files_parse_hidden_def(name) libc_hidden_def (name)
+# define nss_files_parse_hidden_def(name) hidden_def (name)
 #endif