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 | 0f8a4aac375cd882af1c48652926217c719136bd (patch) | |
| tree | 66f533e753cd136aea705ea9b317afa624eac3be /sql/sql_udf.h | |
| parent | 9f88f48b039b4141bbd6978071332a77034cef9f (diff) | |
| parent | 963626cd8075537c88d8d4c2c03a34dfcc06c534 (diff) | |
| download | mariadb-git-0f8a4aac375cd882af1c48652926217c719136bd.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/sql_udf.h')
| -rw-r--r-- | sql/sql_udf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.h b/sql/sql_udf.h index acb04e949a3..ca00901ea67 100644 --- a/sql/sql_udf.h +++ b/sql/sql_udf.h @@ -17,7 +17,7 @@ /* This file defines structures needed by udf functions */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_INTERFACE #pragma interface #endif |