diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:23:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-09 11:23:12 +0200 |
| commit | e99c4c6cf2184d1689718bb33afd66a44e426a71 (patch) | |
| tree | 1960de2a8328f906c885a900aff9bcd59d5cf3fe /sql/item.h | |
| parent | 27da9ccc50385db34f5d7f4c2d2ede0dcaf53bb6 (diff) | |
| parent | 9ab5f6143e793c0afdd552f6c5e76912758df8fa (diff) | |
| download | mariadb-git-e99c4c6cf2184d1689718bb33afd66a44e426a71.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
include/my_global.h:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 6f1f56451ab..8fed871e623 100644 --- a/sql/item.h +++ b/sql/item.h @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ #endif |