diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 12:36:23 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 12:36:23 +0300 |
| commit | c8e0432dbdf5a41677f2c64b5a596badddf717b2 (patch) | |
| tree | 46e4f0b440e6f71cce0bd6d08e417177132ed980 /server-tools/instance-manager/instance.h | |
| parent | 1e148ca472db5a181840dc909fa8b04eac5790f8 (diff) | |
| parent | fea5dcaea1caada7fbd8dbd900336a960299a274 (diff) | |
| download | mariadb-git-c8e0432dbdf5a41677f2c64b5a596badddf717b2.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
client/mysqltest.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/instance.h')
| -rw-r--r-- | server-tools/instance-manager/instance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h index 003cbca8cef..adb66991685 100644 --- a/server-tools/instance-manager/instance.h +++ b/server-tools/instance-manager/instance.h @@ -19,7 +19,7 @@ #include <my_global.h> #include "instance_options.h" -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE) #pragma interface #endif |