From a5fceff840e2928ee7a5cc34196b639d7e65016b Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@redhat.com>
Date: Mon, 28 Jul 2014 14:04:00 +0100
Subject: [PATCH] Move pathmax.h to common-defs.h

This commit moves the inclusion of pathmax.h to common-defs.h and
removes all other inclusions.

gdb/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* common/common-defs.h: Include pathmax.h.
	* defs.h: Do not include pathmax.h.

gdb/gdbserver/
2014-08-07  Gary Benson  <gbenson@redhat.com>

	* server.h: Do not include pathmax.h.
---
 gdb/ChangeLog            | 5 +++++
 gdb/common/common-defs.h | 1 +
 gdb/defs.h               | 3 ---
 gdb/gdbserver/ChangeLog  | 4 ++++
 gdb/gdbserver/server.h   | 3 ---
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e6143ba219..53f8494d28f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* common/common-defs.h: Include pathmax.h.
+	* defs.h: Do not include pathmax.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* common/common-defs.h: Include libiberty.h.
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index eedc318cac6..b31b3b84261 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -33,5 +33,6 @@
 #include <stddef.h>
 #include "ansidecl.h"
 #include "libiberty.h"
+#include "pathmax.h"
 
 #endif /* COMMON_DEFS_H */
diff --git a/gdb/defs.h b/gdb/defs.h
index d9775e32843..189de74c6af 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -48,9 +48,6 @@
 
 #include <unistd.h>
 
-/* For gnulib's PATH_MAX.  */
-#include "pathmax.h"
-
 #include <fcntl.h>
 
 #include "gdb_locale.h"
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 487ada9890a..5c97425063c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Gary Benson  <gbenson@redhat.com>
+
+	* server.h: Do not include pathmax.h.
+
 2014-08-07  Gary Benson  <gbenson@redhat.com>
 
 	* server.h: Do not include libiberty.h.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 9ecd9e02c9d..fc973c1c13d 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -32,9 +32,6 @@
 #endif
 #include <setjmp.h>
 
-/* For gnulib's PATH_MAX.  */
-#include "pathmax.h"
-
 #include <string.h>
 
 #ifdef HAVE_ALLOCA_H
-- 
2.30.2