From e523bd15353350c3480b8a1820a0944b0fa8212e Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 7 Jan 2006 02:32:27 +0000
Subject: Big fricking merge from trunk.

---
 libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h')

diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
index c30d00964..740e793be 100644
--- a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
@@ -24,7 +24,7 @@
 #include <pthread.h>
 
 #if defined _LIBC && !defined NOT_IN_libc
-#include <linuxthreads/internals.h>
+#include <linuxthreads.old/internals.h>
 #endif
 
 /* Mutex type.  */
-- 
cgit v1.2.3