Alexandre Julliard : loader: Don't bother checking for pthread.h existence, we require it anyway.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 17c09347c0e3e814698f8a6fe98b00c33d5e92cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=17c09347c0e3e814698f8a6fe9...

Author: Alexandre Julliard 
Date:   Mon Mar 30 15:05:07 2009 +0200

loader: Don't bother checking for pthread.h existence, we require it anyway.

---

dlls/ntdll/ntdll_misc.h |    4 +---
 loader/main.c           |    4 +---
 loader/main.h           |    2 --
 loader/pthread.c        |   45 ---------------------------------------------
 4 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 56e2b2f..75e60ef 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -22,9 +22,7 @@
 #include <stdarg.h>
 #include <signal.h>
 #include <sys/types.h>
-#ifdef HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>

#include "windef.h"
 #include "winnt.h"
diff --git a/loader/main.c b/loader/main.c
index 4c2cb50..c3189ec 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -33,9 +33,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#ifdef HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>

#include "wine/library.h"
 #include "main.h"
diff --git a/loader/main.h b/loader/main.h
index 0c6fc84..b06423f 100644
--- a/loader/main.h
+++ b/loader/main.h
@@ -22,8 +22,6 @@
 #ifndef __WINE_LOADER_MAIN_H
 #define __WINE_LOADER_MAIN_H

-#include "wine/pthread.h"
-
 struct wine_preload_info
 {
     void  *addr;
diff --git a/loader/pthread.c b/loader/pthread.c
index e4e0831..712bd37 100644
--- a/loader/pthread.c
+++ b/loader/pthread.c
@@ -39,9 +39,7 @@
 #include <sys/ucontext.h>
 #include <sys/thr.h>
 #endif
-#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
-#endif
 #ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
 #endif
@@ -49,8 +47,6 @@
 #include "wine/library.h"
 #include "wine/pthread.h"

-#ifdef HAVE_PTHREAD_H
-
 static int init_done;
 static int nb_threads = 1;

@@ -223,47 +219,6 @@ static void DECLSPEC_NORETURN abort_thread( long status )
     pthread_exit( (void *)status );
 }

-#else  /* HAVE_PTHREAD_H */
-
-static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size )
-{
-}
-
-static void init_thread( struct wine_pthread_thread_info *info )
-{
-}
-
-static int create_thread( struct wine_pthread_thread_info *info )
-{
-    return -1;
-}
-
-static void init_current_teb( struct wine_pthread_thread_info *info )
-{
-}
-
-static void *get_current_teb(void)
-{
-    return NULL;
-}
-
-static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info )
-{
-    abort();
-}
-
-static void DECLSPEC_NORETURN abort_thread( long status )
-{
-    abort();
-}
-
-static int pthread_sigmask( int how, const sigset_t *newset, sigset_t *oldset )
-{
-    return -1;
-}
-
-#endif  /* HAVE_PTHREAD_H */
-

/***********************************************************************
  *           pthread_functions