diff options
author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:08:57 -0500 |
---|---|---|
committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:08:57 -0500 |
commit | 1b2a2c8647752b4c004d97ca9b7f847b0ecddb91 (patch) | |
tree | 941b7d6878a10d6e28ebc6ca06fd12cb28391c91 /include/my_global.h | |
parent | 36b3f0a0529ab92fdedcbdefa7d1686b61f90429 (diff) | |
parent | 3ca4caef3fa58fd48c1f14777e08f617e434a049 (diff) | |
download | mariadb-git-1b2a2c8647752b4c004d97ca9b7f847b0ecddb91.tar.gz |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
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 62c6a5d1e4a..f059d603976 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) && defined(__GNUC__) && (__GNUC__ < 3) +#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3) #define USE_PRAGMA_INTERFACE #endif |