Alexandre Julliard : Avoid DECLSPEC_NORETURN on function pointers for
MSVC compatibility.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 4 08:42:06 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 3215c3ac9152ec9e1ed854fd28e1e96bc90c8d9e
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3215c3ac9152ec9e1ed854fd28e1e96bc90c8d9e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 4 14:52:43 2006 +0100
Avoid DECLSPEC_NORETURN on function pointers for MSVC compatibility.
---
include/wine/pthread.h | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/include/wine/pthread.h b/include/wine/pthread.h
index 36381fe..8705a7f 100644
--- a/include/wine/pthread.h
+++ b/include/wine/pthread.h
@@ -71,15 +71,6 @@ struct wine_pthread_callbacks
#endif /* HAVE_PTHREAD_H */
-/* we don't want to include winnt.h here */
-#ifndef DECLSPEC_NORETURN
-# ifdef __GNUC__
-# define DECLSPEC_NORETURN __attribute__((noreturn))
-# else
-# define DECLSPEC_NORETURN
-# endif
-#endif
-
/* thread information used to creating and exiting threads */
struct wine_pthread_thread_info
{
@@ -101,8 +92,13 @@ struct wine_pthread_functions
int (*create_thread)( struct wine_pthread_thread_info *info );
void (*init_current_teb)( struct wine_pthread_thread_info *info );
void * (*get_current_teb)(void);
- void (* DECLSPEC_NORETURN exit_thread)( struct wine_pthread_thread_info *info );
- void (* DECLSPEC_NORETURN abort_thread)( long status );
+#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
};
extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size );
More information about the wine-cvs
mailing list