diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:31:27 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:31:27 +0200 |
| commit | 81c534460994eb398ea05578dad6bdd9af829722 (patch) | |
| tree | bc61b9962d1f6b91d6c0f88748fae5406111918c /include/my_global.h | |
| parent | d406a6478092e3ddab0146d2c05eeab3e1f30e6e (diff) | |
| parent | 4be881f25c165f29865e41d1f681a9aec46adb74 (diff) | |
| download | mariadb-git-81c534460994eb398ea05578dad6bdd9af829722.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
include/my_global.h:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index bd3fcbb6b07..9f3acef0ff6 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -44,7 +44,7 @@ #endif /* __CYGWIN__ */ /* Determine when to use "#pragma interface" */ -#if !defined(__CYGWIN__) && !defined(__ICC) && (__GNUC__ < 3) +#if !defined(__CYGWIN__) && !defined(__ICC) && defined(__GNUC__) && (__GNUC__ < 3) #define USE_PRAGMA_INTERFACE #endif |