From 4176f14d9c9e509425bffc01404c751e238b1f01 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 26 Sep 2018 05:28:07 -0600 Subject: Don't check HAVE_UNISTD_H I noticed some spots that were checking HAVE_UNISTD_H. There is no need to do this, as is unconditionally included in many places in gdb. This sort of cleanup was done once before, in 2013: 2013-07-01 Pedro Alves * defs.h: Don't check HAVE_UNISTD_H before including . (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): Delete. * tracepoint.c: Don't check HAVE_UNISTD_H before including . HAVE_UNISTD_H seems to come from gnulib, so there are still mentions of it in the source. gdb/ChangeLog 2018-10-01 Tom Tromey * unittests/scoped_mmap-selftests.c: Don't check HAVE_UNISTD_H. * unittests/scoped_fd-selftests.c: Don't check HAVE_UNISTD_H. * common/scoped_fd.h: Don't check HAVE_UNISTD_H. --- gdb/unittests/scoped_fd-selftests.c | 7 ------- gdb/unittests/scoped_mmap-selftests.c | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'gdb/unittests') diff --git a/gdb/unittests/scoped_fd-selftests.c b/gdb/unittests/scoped_fd-selftests.c index 4d74541..d5c0d30 100644 --- a/gdb/unittests/scoped_fd-selftests.c +++ b/gdb/unittests/scoped_fd-selftests.c @@ -21,9 +21,6 @@ #include "common/scoped_fd.h" #include "config.h" - -#ifdef HAVE_UNISTD_H - #include "selftest.h" namespace selftests { @@ -78,13 +75,9 @@ run_tests () } /* namespace scoped_fd */ } /* namespace selftests */ -#endif /* HAVE_UNISTD_H */ - void _initialize_scoped_fd_selftests () { -#ifdef HAVE_UNISTD_H selftests::register_test ("scoped_fd", selftests::scoped_fd::run_tests); -#endif } diff --git a/gdb/unittests/scoped_mmap-selftests.c b/gdb/unittests/scoped_mmap-selftests.c index e9d4afd..b181e02 100644 --- a/gdb/unittests/scoped_mmap-selftests.c +++ b/gdb/unittests/scoped_mmap-selftests.c @@ -22,7 +22,7 @@ #include "common/scoped_mmap.h" #include "config.h" -#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_UNISTD_H) +#if defined(HAVE_SYS_MMAN_H) #include "selftest.h" #include "common/gdb_unlinker.h" @@ -132,12 +132,12 @@ run_tests () } /* namespace mmap_file */ } /* namespace selftests */ -#endif /* !defined(HAVE_SYS_MMAN_H) || !defined(HAVE_UNISTD_H) */ +#endif /* !defined(HAVE_SYS_MMAN_H) */ void _initialize_scoped_mmap_selftests () { -#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_UNISTD_H) +#if defined(HAVE_SYS_MMAN_H) selftests::register_test ("scoped_mmap", selftests::scoped_mmap::run_tests); selftests::register_test ("mmap_file", -- cgit v1.1