aboutsummaryrefslogtreecommitdiff
path: root/posix/sys
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2018-02-07 15:45:58 -0500
committerZack Weinberg <zackw@panix.com>2018-02-12 07:34:50 -0500
commite16deca62e16f645213dffd4ecd1153c37765f17 (patch)
treeb86b60ce878fbe35438ab5ef915b5c9feaf40b50 /posix/sys
parentde800d83059dbedb7d151580f0a3bdc9eaf37340 (diff)
downloadglibc-e16deca62e16f645213dffd4ecd1153c37765f17.zip
glibc-e16deca62e16f645213dffd4ecd1153c37765f17.tar.gz
glibc-e16deca62e16f645213dffd4ecd1153c37765f17.tar.bz2
[BZ #19239] Don't include sys/sysmacros.h from sys/types.h.
This completes the deprecation and removal of this inclusion, which was begun in the 2.25 release. * posix/sys/types.h: Don't include sys/sysmacros.h. * misc/sys/sysmacros.h: Remove the conditional deprecation warnings for the macros defined by this header.
Diffstat (limited to 'posix/sys')
-rw-r--r--posix/sys/types.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/posix/sys/types.h b/posix/sys/types.h
index e8d51a1..db524d6 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -194,15 +194,6 @@ typedef int register_t __attribute__ ((__mode__ (__word__)));
/* It also defines `fd_set' and the FD_* macros for `select'. */
# include <sys/select.h>
-
-/* BSD defines `major', `minor', and `makedev' in this header.
- However, these symbols are likely to collide with user code, so we are
- going to stop defining them here in an upcoming release. Code that needs
- these macros should include <sys/sysmacros.h> directly. Code that does
- not need these macros should #undef them after including this header. */
-# define __SYSMACROS_DEPRECATED_INCLUSION
-# include <sys/sysmacros.h>
-# undef __SYSMACROS_DEPRECATED_INCLUSION
#endif /* Use misc. */