system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of the no longer needed DECL_GLOBAL_CONSTRUCTOR macro.

Browse source
This commit is contained in:
Alexandre Julliard 2006-01-14 17:08:52 +01:00
parent ebe727e56d
commit cfe45cc130
2 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/wine/port.h
View file

@ -210,32 +210,6 @@ struct statvfs
#endif /* __GNUC__ */
/* Constructor functions */
#ifdef __GNUC__
# define DECL_GLOBAL_CONSTRUCTOR(func) \
static void func(void) __attribute__((constructor)); \
static void func(void)
#elif defined(__i386__)
# define DECL_GLOBAL_CONSTRUCTOR(func) \
static void __dummy_init_##func(void) { \
asm(".section .init,\"ax\"\n\t" \
"call " #func "\n\t" \
".previous"); } \
static void func(void)
#elif defined(__sparc__)
# define DECL_GLOBAL_CONSTRUCTOR(func) \
static void __dummy_init_##func(void) { \
asm("\t.section \".init\",#alloc,#execinstr\n" \
"\tcall " #func "\n" \
"\tnop\n" \
"\t.section \".text\",#alloc,#execinstr\n" ); } \
static void func(void)
#else
# error You must define the DECL_GLOBAL_CONSTRUCTOR macro for your platform
#endif
/* Register functions */
#ifdef __i386__

9
loader/kthread.c
View file

@ -974,7 +974,14 @@ void __pthread_initialize(void)
if (libc_pthread_init) libc_multiple_threads = libc_pthread_init( &libc_pthread_functions );
}
}
DECL_GLOBAL_CONSTRUCTOR(init) { __pthread_initialize(); }
#ifdef __GNUC__
static void init(void) __attribute__((constructor));
static void init(void)
{
__pthread_initialize();
}
#endif
static struct pthread_functions libc_pthread_functions =
{