diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-09 12:16:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-09 12:16:59 +0200 |
| commit | a91c804054273a3a645888573c9795d7aa42ac5f (patch) | |
| tree | 66f533e753cd136aea705ea9b317afa624eac3be /sql/item_func.h | |
| parent | 12a3eb4dc8baba68a5e96094894e8a84aeb90b5f (diff) | |
| parent | 61b5eb0d99988934fe8b8734737bedfd95cdcd7b (diff) | |
| download | mariadb-git-a91c804054273a3a645888573c9795d7aa42ac5f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 885e2383290..6b6e5d4b8ec 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -17,7 +17,7 @@ /* Function items used by mysql */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ #endif |