diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-26 12:10:05 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-26 12:10:05 +0200 |
| commit | 7d7b5dbcae39bd0d3c035ab02be6100e9bc226cd (patch) | |
| tree | 066d77fb4f7d7a5c0ac156d5fa637310fed71757 /client | |
| parent | aa3a934b9d2e7585d9e40a4f56a060bad718baf5 (diff) | |
| parent | 22944a956350d6276f9a852f78dee2b8126e68c7 (diff) | |
| download | mariadb-git-7d7b5dbcae39bd0d3c035ab02be6100e9bc226cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
include/my_global.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.cc | 2 | ||||
| -rw-r--r-- | client/sql_string.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index 9dcf19dad1d..690997152f1 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -16,7 +16,7 @@ /* This file is originally from the mysql distribution. Coded by monty */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif diff --git a/client/sql_string.h b/client/sql_string.h index aec40466d2b..fd6d3ef59d9 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -16,7 +16,7 @@ /* This file is originally from the mysql distribution. Coded by monty */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ #endif |