Skip to content

W
wine-winehq
Commit abbf38cc authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ntdll: Fix a couple of warnings on Solaris.

parent ad7fc048
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/ntdll/signal_i386.c
View file @ abbf38cc
...@@ -636,7 +636,7 @@ static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext ...@@ -636,7 +636,7 @@ static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext
__asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es"); __asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es");
thread_data = get_current_teb()->SystemReserved2; thread_data = (struct ntdll_thread_data *)get_current_teb()->SystemReserved2;
wine_set_fs( thread_data->fs ); wine_set_fs( thread_data->fs );
wine_set_gs( thread_data->gs ); wine_set_gs( thread_data->gs );
...@@ -672,7 +672,6 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); ...@@ -672,7 +672,6 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context );
static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs )
{ {
TEB *teb = get_current_teb(); TEB *teb = get_current_teb();
struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2;
/* get %fs and %gs at time of the fault */ /* get %fs and %gs at time of the fault */
#ifdef FS_sig #ifdef FS_sig
...@@ -687,8 +686,11 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * ...@@ -687,8 +686,11 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *
#endif #endif
#ifndef __sun /* see above for Solaris handling */ #ifndef __sun /* see above for Solaris handling */
{
struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2;
wine_set_fs( thread_data->fs ); wine_set_fs( thread_data->fs );
wine_set_gs( thread_data->gs ); wine_set_gs( thread_data->gs );
}
#endif #endif
if (!wine_ldt_is_system(CS_sig(sigcontext)) || if (!wine_ldt_is_system(CS_sig(sigcontext)) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment