2013-09-19  Luis Machado  <lgustavo@codesourcery.com>

	* common/ptid.h (GET_LWP, GET_PID): Moved from
	linux-nat.h.
	(is_lwp, BUILD_LWP): Likewise.
	* linux-nat.h (GET_LWP, GET_PID): Moved to
	common/ptid.h.
	(is_lwp, BUILD_LWP): Likewise.

 gdb/common/ptid.h | 6 ++++++
 gdb/linux-nat.h   | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gdb/common/ptid.h b/gdb/common/ptid.h
index fefe8b6..ceafd02 100644
--- a/gdb/common/ptid.h
+++ b/gdb/common/ptid.h
@@ -20,6 +20,12 @@
 #ifndef PTID_H
 #define PTID_H
 
+/* Helper macros.  */
+#define GET_LWP(ptid)		ptid_get_lwp (ptid)
+#define GET_PID(ptid)		ptid_get_pid (ptid)
+#define is_lwp(ptid)		(GET_LWP (ptid) != 0)
+#define BUILD_LWP(lwp, pid)	ptid_build (pid, lwp, 0)
+
 /* The ptid struct is a collection of the various "ids" necessary
    for identifying the inferior.  This consists of the process id
    (pid), thread id (tid), and other fields necessary for uniquely
diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
index 044f646..0fc68ef 100644
--- a/gdb/linux-nat.h
+++ b/gdb/linux-nat.h
@@ -110,11 +110,6 @@ extern struct lwp_info *lwp_list;
        (LP) != NULL;							\
        (LP) = (LP)->next)
 
-#define GET_LWP(ptid)		ptid_get_lwp (ptid)
-#define GET_PID(ptid)		ptid_get_pid (ptid)
-#define is_lwp(ptid)		(GET_LWP (ptid) != 0)
-#define BUILD_LWP(lwp, pid)	ptid_build (pid, lwp, 0)
-
 /* Attempt to initialize libthread_db.  */
 void check_for_thread_db (void);