diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/shlib-compat.h | 4 | ||||
| -rw-r--r-- | nss/nss_files/files-parse.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f7613dbf50..5df19cbb94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * include/shlib-compat.h [!NOT_IN_libc]: Remove. + * nss/nss_files/files-parse.c (IS_IN_libc): Replace with + IS_IN (libc). + * elf/Makefile (libof-sotruss-lib): Set as extramodules. * elf/Makefile (CPPFLAGS-.os): Remove IN_LIB. diff --git a/include/shlib-compat.h b/include/shlib-compat.h index 30804d369c..062da8d669 100644 --- a/include/shlib-compat.h +++ b/include/shlib-compat.h @@ -45,10 +45,6 @@ && (!(ABI_##lib##_##obsoleted - 0) \ || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))) -# ifndef NOT_IN_libc -# define IS_IN_libc 1 -# endif - /* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to the version set name to use for e.g. symbols first introduced into libm in the GLIBC_2.1 version. Definitions of symbols with explicit diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 1da1a6f352..42fd1f3757 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -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) -# ifdef IS_IN_libc +# if IS_IN (libc) /* We are defining one of the functions that actually lives in libc because it is used to implement fget*ent and suchlike. */ # define nss_files_parse_hidden_def(name) libc_hidden_def (name) |