From: Siddhesh Poyarekar Date: Thu, 20 Nov 2014 06:51:01 +0000 (+0530) Subject: Remove IS_IN_libc X-Git-Tag: upstream/2.30~6768 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2886d2d14dd7de6339b04505c5d2f9fc5c844751;p=external%2Fglibc.git Remove IS_IN_libc Replace it with IS_IN (libc) and remove the one place that it is defined in. The generated code remains unchanged on x86_64. * include/shlib-compat.h [!NOT_IN_libc]: Remove. * nss/nss_files/files-parse.c (IS_IN_libc): Replace with IS_IN (libc). --- diff --git a/ChangeLog b/ChangeLog index f7613db..5df19cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-11-24 Siddhesh Poyarekar + * 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 30804d3..062da8d 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 1da1a6f..42fd1f3 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)