From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- libpthread/linuxthreads_db/thread_dbP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpthread/linuxthreads_db/thread_dbP.h') diff --git a/libpthread/linuxthreads_db/thread_dbP.h b/libpthread/linuxthreads_db/thread_dbP.h index 407f30634..64fd2e511 100644 --- a/libpthread/linuxthreads_db/thread_dbP.h +++ b/libpthread/linuxthreads_db/thread_dbP.h @@ -6,7 +6,7 @@ #include #include "proc_service.h" #include "thread_db.h" -#include "../linuxthreads/descr.h" +#include "internals.h" /* Indices for the symbol names. */ -- cgit v1.2.3