diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-23 19:01:16 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-23 19:01:16 +0200 |
| commit | 3e2417ed57a8741a366e365839daa1e5bf0ec5cd (patch) | |
| tree | 92425903a86b8180d4e747e7e84398c26768bcb7 /include/my_global.h | |
| parent | 7ff2a5a54371568a414dfbd77082427186d6a83c (diff) | |
| parent | d35e537a685d44eb43cf59f3539227e45efb8d00 (diff) | |
| download | mariadb-git-3e2417ed57a8741a366e365839daa1e5bf0ec5cd.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_global.h:
Auto merged
myisam/rt_split.c:
Auto merged
sql/field_conv.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/my_vsnprintf.c:
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 068832e927d..75a99133e33 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 |