From 8c2b377d28710215838741cd9778c8e7229ebf26 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 31 Jan 2006 14:41:37 +0000
Subject: s/IS_IN_linuxthreads/IS_IN_libpthread/, some prototypes, correct
 Makefile.in, disable __res_state, unavailable in resolv.h

---
 libpthread/linuxthreads/sysdeps/i386/pt-machine.h                    | 3 +++
 libpthread/linuxthreads/sysdeps/i386/tls.h                           | 2 +-
 libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h                | 4 ++--
 libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h               | 1 -
 libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 1 -
 libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c      | 1 -
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libpthread/linuxthreads/sysdeps')

diff --git a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h
index 8c3698dc0..8483d4ef6 100644
--- a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h
+++ b/libpthread/linuxthreads/sysdeps/i386/pt-machine.h
@@ -77,6 +77,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
 }
 
 
+PT_EI int get_eflags (void);
 PT_EI int
 get_eflags (void)
 {
@@ -86,6 +87,7 @@ get_eflags (void)
 }
 
 
+PT_EI void set_eflags (int newflags);
 PT_EI void
 set_eflags (int newflags)
 {
@@ -93,6 +95,7 @@ set_eflags (int newflags)
 }
 
 
+PT_EI int compare_and_swap_is_available (void);
 PT_EI int
 compare_and_swap_is_available (void)
 {
diff --git a/libpthread/linuxthreads/sysdeps/i386/tls.h b/libpthread/linuxthreads/sysdeps/i386/tls.h
index c5cb07ba3..f230a33ba 100644
--- a/libpthread/linuxthreads/sysdeps/i386/tls.h
+++ b/libpthread/linuxthreads/sysdeps/i386/tls.h
@@ -117,7 +117,7 @@ typedef struct
 #   define TLS_LOAD_EBX
 #  endif
 
-#  if !defined IS_IN_linuxthreads && !defined DO_MODIFY_LDT
+#  if !defined IS_IN_libpthread && !defined DO_MODIFY_LDT
 #   include "useldt.h"		/* For the structure.  */
 #  endif
 #  if __ASSUME_LDT_WORKS > 0
diff --git a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
index 803466de1..51162b95e 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
@@ -5,7 +5,7 @@
 #include <sys/cdefs.h>
 #include <bits/uClibc_page.h>
 
-#if IS_IN_linuxthreads
+#ifdef IS_IN_libpthread
 #include "kernel-features.h"
 
 #ifndef _GNU_SOURCE
@@ -39,7 +39,7 @@
 extern void *__libc_stack_end;
 extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
 
-#endif /* IS_IN_linuxthreads */
+#endif /* IS_IN_libpthread */
 
 /* Use a funky version in a probably vein attempt at preventing gdb 
  * from dlopen()'ing glibc's libthread_db library... */
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h
index d2a16d8ce..85477eb48 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/fork.h
@@ -19,7 +19,6 @@
 
 #include <list.h>
 #include <bits/libc-lock.h>
-#include <sysdep.h>
 
 struct fork_block
 {
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index c8be0fdd3..a5dbeff1e 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -17,7 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <sysdep.h>
 #include <tls.h>
 #include <pt-machine.h>
 #ifndef __ASSEMBLER__
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
index 23731b3ee..7c9fe36e2 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <sysdep.h>
 #include <sys/syscall.h>
 #include <linuxthreads/internals.h>
 
-- 
cgit v1.2.3