[PATCH] Move include block to pathstuff.h (no-tn-check)

Tom Tromey tromey@adacore.com
Tue Nov 10 16:57:26 GMT 2020


A recent commit caused pathstuff.cc to fail to compile on mingw, like:

../../binutils-gdb/gdbsupport/pathstuff.cc:324:1: error: no previous declaration for 'std::string find_gdb_home_config_file(const char*, _stati64*)' [-Werror=missing-declarations]

Some newly-added #includes were changing which "stat" was being seen
by the compiler.  This patch moves the includes to the header, so that
the declaration and definition now agree.

gdbsupport/ChangeLog
2020-11-10  Tom Tromey  <tromey@adacore.com>

	* pathstuff.h: Move include block here...
	* pathstuff.cc: ... from here.
---
 gdbsupport/ChangeLog    | 5 +++++
 gdbsupport/pathstuff.cc | 4 ----
 gdbsupport/pathstuff.h  | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc
index a52e53b8671..311456720e4 100644
--- a/gdbsupport/pathstuff.cc
+++ b/gdbsupport/pathstuff.cc
@@ -23,10 +23,6 @@
 #include "filenames.h"
 #include "gdb_tilde_expand.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #ifdef USE_WIN32API
 #include <windows.h>
 #endif
diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h
index 996c8f2bbf6..7e35f62c78c 100644
--- a/gdbsupport/pathstuff.h
+++ b/gdbsupport/pathstuff.h
@@ -22,6 +22,10 @@
 
 #include "gdbsupport/byte-vector.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 /* Path utilities.  */
 
 /* Return the real path of FILENAME, expanding all the symbolic links.
-- 
2.26.2



More information about the Gdb-patches mailing list