diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-07 18:33:52 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-07 18:33:52 +0200 |
| commit | 6212bb67f4695962748a5981e1b9fea105af74f6 (patch) | |
| tree | 0b6a4e918af592a90eb20ffdb2d28ece568ab4bd /include | |
| parent | 36861a968ad143f662db489cd8f859186ee375c2 (diff) | |
| download | glibc-6212bb67f4695962748a5981e1b9fea105af74f6.zip glibc-6212bb67f4695962748a5981e1b9fea105af74f6.tar.gz glibc-6212bb67f4695962748a5981e1b9fea105af74f6.tar.bz2 | |
nss_files: Move into libc
This is the first step towards fixing bug 27959.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc-symbols.h | 23 | ||||
| -rw-r--r-- | include/netdb.h | 2 | ||||
| -rw-r--r-- | include/nss_files.h | 10 |
3 files changed, 6 insertions, 29 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 127ea65..d41ecf4 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -798,29 +798,6 @@ for linking") # define libdl_hidden_data_ver(local, name) #endif -#if IS_IN (libnss_files) -# define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) -# define libnss_files_hidden_tls_proto(name, attrs...) \ - hidden_tls_proto (name, ##attrs) -# define libnss_files_hidden_def(name) hidden_def (name) -# define libnss_files_hidden_weak(name) hidden_weak (name) -# define libnss_files_hidden_ver(local, name) hidden_ver (local, name) -# define libnss_files_hidden_data_def(name) hidden_data_def (name) -# define libnss_files_hidden_tls_def(name) hidden_tls_def (name) -# define libnss_files_hidden_data_weak(name) hidden_data_weak (name) -# define libnss_files_hidden_data_ver(local, name) hidden_data_ver(local, name) -#else -# define libnss_files_hidden_proto(name, attrs...) -# define libnss_files_hidden_tls_proto(name, attrs...) -# define libnss_files_hidden_def(name) -# define libnss_files_hidden_weak(name) -# define libnss_files_hidden_ver(local, name) -# define libnss_files_hidden_data_def(name) -# define libnss_files_hidden_tls_def(name) -# define libnss_files_hidden_data_weak(name) -# define libnss_files_hidden_data_ver(local, name) -#endif - #if IS_IN (libnsl) # define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnsl_hidden_tls_proto(name, attrs...) \ diff --git a/include/netdb.h b/include/netdb.h index 82e102f..4dcdbb8 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -217,7 +217,7 @@ extern enum nss_status _nss_netgroup_parseline (char **cursor, struct __netgrent *result, char *buffer, size_t buflen, int *errnop); -libnss_files_hidden_proto (_nss_netgroup_parseline) +libc_hidden_proto (_nss_netgroup_parseline) #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setprotoent (int); \ diff --git a/include/nss_files.h b/include/nss_files.h index 7bf1951..dd0081a 100644 --- a/include/nss_files.h +++ b/include/nss_files.h @@ -124,13 +124,13 @@ extern nss_files_parse_line _nss_files_parse_servent; extern nss_files_parse_line _nss_files_parse_sgent; extern nss_files_parse_line _nss_files_parse_spent; -libnss_files_hidden_proto (_nss_files_parse_etherent) +libc_hidden_proto (_nss_files_parse_etherent) libc_hidden_proto (_nss_files_parse_grent) -libnss_files_hidden_proto (_nss_files_parse_netent) -libnss_files_hidden_proto (_nss_files_parse_protoent) +libc_hidden_proto (_nss_files_parse_netent) +libc_hidden_proto (_nss_files_parse_protoent) libc_hidden_proto (_nss_files_parse_pwent) -libnss_files_hidden_proto (_nss_files_parse_rpcent) -libnss_files_hidden_proto (_nss_files_parse_servent) +libc_hidden_proto (_nss_files_parse_rpcent) +libc_hidden_proto (_nss_files_parse_servent) libc_hidden_proto (_nss_files_parse_sgent) libc_hidden_proto (_nss_files_parse_spent) |