Commit 489cb8b7 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

GCC 3.0 has not been released yet, but it is good to be prepared.

parent d50f6424
...@@ -35,7 +35,7 @@ typedef enum ...@@ -35,7 +35,7 @@ typedef enum
extern void LIBRES_RegisterResources(const wrc_resource32_t * const * Res); extern void LIBRES_RegisterResources(const wrc_resource32_t * const * Res);
#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ >= 7) #if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
#define WINE_CONSTRUCTOR __attribute__((constructor)) #define WINE_CONSTRUCTOR __attribute__((constructor))
#define HAVE_WINE_CONSTRUCTOR #define HAVE_WINE_CONSTRUCTOR
#else #else
......
...@@ -57,7 +57,7 @@ extern "C" { ...@@ -57,7 +57,7 @@ extern "C" {
/* Calling conventions definitions */ /* Calling conventions definitions */
#ifdef __i386__ #ifdef __i386__
# if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ >= 7) # if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
# define __stdcall __attribute__((__stdcall__)) # define __stdcall __attribute__((__stdcall__))
# define __cdecl __attribute__((__cdecl__)) # define __cdecl __attribute__((__cdecl__))
# define __RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es") # define __RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es")
......
...@@ -897,7 +897,7 @@ void create_output(gen_res* top) ...@@ -897,7 +897,7 @@ void create_output(gen_res* top)
/* Perform autoregistration */ /* Perform autoregistration */
fprintf( code, fprintf( code,
"#ifndef __WINE__\n" "#ifndef __WINE__\n"
"#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)\n" "#if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))\n"
"static void DoIt(void) __attribute__((constructor));\n" "static void DoIt(void) __attribute__((constructor));\n"
"#else\n" "#else\n"
"static void DoIt(void);\n" "static void DoIt(void);\n"
......
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