diff options
| author | Tom Tromey <tom@tromey.com> | 2018-09-26 05:28:07 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-10-01 02:58:23 -0600 |
| commit | 4176f14d9c9e509425bffc01404c751e238b1f01 (patch) | |
| tree | 52d0fe01cad44b8950278103ad719603b3837139 | |
| parent | a95746f91769c0f65e9393ff83aad0871d1a666b (diff) | |
| download | gdb-4176f14d9c9e509425bffc01404c751e238b1f01.zip gdb-4176f14d9c9e509425bffc01404c751e238b1f01.tar.gz gdb-4176f14d9c9e509425bffc01404c751e238b1f01.tar.bz2 | |
Don't check HAVE_UNISTD_H
I noticed some spots that were checking HAVE_UNISTD_H. There is no
need to do this, as <unistd.h> is unconditionally included in many
places in gdb. This sort of cleanup was done once before, in 2013:
2013-07-01 Pedro Alves <palves@redhat.com>
* defs.h: Don't check HAVE_UNISTD_H before including <unistd.h>.
(STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): Delete.
* tracepoint.c: Don't check HAVE_UNISTD_H before including
<unistd.h>.
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 <tom@tromey.com>
* 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.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/common/scoped_fd.h | 5 | ||||
| -rw-r--r-- | gdb/unittests/scoped_fd-selftests.c | 7 | ||||
| -rw-r--r-- | gdb/unittests/scoped_mmap-selftests.c | 6 |
4 files changed, 9 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3cc68f5..b1724a0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2018-10-01 Tom Tromey <tom@tromey.com> + * 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. + +2018-10-01 Tom Tromey <tom@tromey.com> + * README: Minor change. 2018-09-30 Pedro Alves <palves@redhat.com> diff --git a/gdb/common/scoped_fd.h b/gdb/common/scoped_fd.h index a6a8ab9..c2125bd 100644 --- a/gdb/common/scoped_fd.h +++ b/gdb/common/scoped_fd.h @@ -20,10 +20,6 @@ #ifndef SCOPED_FD_H #define SCOPED_FD_H -#include "config.h" - -#ifdef HAVE_UNISTD_H - #include <unistd.h> /* A smart-pointer-like class to automatically close a file descriptor. */ @@ -56,5 +52,4 @@ private: int m_fd; }; -#endif /* HAVE_UNISTD_H */ #endif /* SCOPED_FD_H */ 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", |