blob: e9c9ac18a166fb4d15aa7eb657a5dc3586dc077a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From c96187cdbddd742728557062b85d05ac320c3e8f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 19 Mar 2015 07:51:48 +0100
Subject: Revert various changes conflicting with Maarten Lankhorst's gstreamer
hack v5.
Note: These changes have to be reapplied with the corresponding -post patchset
afterwards.
---
dlls/ntdll/ntdll_misc.h | 1 -
dlls/ntdll/thread.c | 7 -------
2 files changed, 8 deletions(-)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index e7facf3..88531df 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -243,7 +243,6 @@ struct ntdll_thread_data
WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */
void *exit_frame; /* 204 exit frame pointer */
#endif
- void *pthread_stack; /* 208/318 pthread stack */
};
C_ASSERT( FIELD_OFFSET(TEB, SpareBytes1) + sizeof(struct ntdll_thread_data) <=
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 6ad4b95..3ad51a2 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -391,8 +391,6 @@ void terminate_thread( int status )
void exit_thread( int status )
{
static void *prev_teb;
- shmlocal_t *shmlocal;
- sigset_t sigset;
TEB *teb;
if (status) /* send the exit code to the server (0 is already the default) */
@@ -431,11 +429,6 @@ void exit_thread( int status )
}
}
- sigemptyset( &sigset );
- sigaddset( &sigset, SIGQUIT );
- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-
close( ntdll_get_thread_data()->wait_fd[0] );
close( ntdll_get_thread_data()->wait_fd[1] );
close( ntdll_get_thread_data()->reply_fd );
--
2.6.4
|
GitWeb
