Alexandre Julliard : include: Get rid of the no longer used wine/pthread.h.
Alexandre Julliard
julliard at winehq.org
Mon Jul 6 09:33:53 CDT 2009
Module: wine
Branch: master
Commit: 1d5cb9d23b71851ba069bdbb91f1d74187b3c7f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5cb9d23b71851ba069bdbb91f1d74187b3c7f2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Jul 4 11:36:44 2009 +0200
include: Get rid of the no longer used wine/pthread.h.
---
include/wine/pthread.h | 67 ------------------------------------------------
libs/wine/port.c | 5 ++-
2 files changed, 3 insertions(+), 69 deletions(-)
diff --git a/include/wine/pthread.h b/include/wine/pthread.h
deleted file mode 100644
index 561c22c..0000000
--- a/include/wine/pthread.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Definitions for Wine pthread emulation
- *
- * Copyright 2003 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINE_PTHREAD_H
-#define __WINE_WINE_PTHREAD_H
-
-struct wine_pthread_callbacks;
-
-#include <signal.h>
-
-#ifndef HAVE_SIGSET_T
-struct sigset_t;
-typedef struct sigset_t sigset_t;
-#endif
-
-/* thread information used to creating and exiting threads */
-struct wine_pthread_thread_info
-{
- void *stack_base; /* base address of the stack */
- size_t stack_size; /* size of the stack */
- void *teb_base; /* base address of the TEB */
- size_t teb_size; /* size of the TEB (possibly including signal stack) */
- unsigned short teb_sel; /* selector to use for TEB */
- int pid; /* Unix process id */
- int tid; /* Unix thread id */
- void (*entry)( struct wine_pthread_thread_info *info ); /* thread entry point */
- long exit_status; /* thread exit status when calling wine_pthread_exit_thread */
-};
-
-struct wine_pthread_functions
-{
- void (*init_process)( const struct wine_pthread_callbacks *callbacks, size_t size );
- void (*init_thread)( struct wine_pthread_thread_info *info );
- int (*create_thread)( struct wine_pthread_thread_info *info );
- void (*init_current_teb)( struct wine_pthread_thread_info *info );
- void * (*get_current_teb)(void);
-#ifdef __GNUC__
- void (* __attribute__((noreturn)) exit_thread)( struct wine_pthread_thread_info *info );
- void (* __attribute__((noreturn)) abort_thread)( long status );
-#else
- void (*exit_thread)( struct wine_pthread_thread_info *info );
- void (*abort_thread)( long status );
-#endif
- int (*sigprocmask)( int how, const sigset_t *newset, sigset_t *oldset );
-};
-
-extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size );
-extern void wine_pthread_set_functions( const struct wine_pthread_functions *functions, size_t size );
-
-#endif /* __WINE_WINE_PTHREAD_H */
diff --git a/libs/wine/port.c b/libs/wine/port.c
index cfd3bcd..1e05e2b 100644
--- a/libs/wine/port.c
+++ b/libs/wine/port.c
@@ -26,9 +26,10 @@
#include <sys/types.h>
#include "wine/library.h"
-#include "wine/pthread.h"
-static struct wine_pthread_functions pthread_functions;
+/* no longer used, for backwards compatibility only */
+struct wine_pthread_functions;
+static void *pthread_functions[8];
/***********************************************************************
* wine_pthread_get_functions
More information about the wine-cvs
mailing list