diff options
| author | unknown <kent@mysql.com> | 2005-06-02 02:57:18 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-06-02 02:57:18 +0200 |
| commit | e71ef9416f84922310f88c1cd7295334dadfeb68 (patch) | |
| tree | 11e854a5c872762d333b583afd7b3b4bbeae11b1 /sql/examples | |
| parent | 638bb0a2917b966f136f0046234fc40b9407df29 (diff) | |
| parent | cee10f979e3bf4a26dca94bd94002b316e400733 (diff) | |
| download | mariadb-git-e71ef9416f84922310f88c1cd7295334dadfeb68.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/examples')
| -rw-r--r-- | sql/examples/ha_archive.cc | 4 | ||||
| -rw-r--r-- | sql/examples/ha_example.cc | 4 | ||||
| -rw-r--r-- | sql/examples/ha_tina.cc | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index bc4af0c7dc7..51268fd60b3 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -14,7 +14,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#include <my_global.h> + +#ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index cb0780ea74d..b122c4dc83f 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -63,7 +63,9 @@ -Brian */ -#ifdef __GNUC__ +#include <my_global.h> + +#ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 0345a170c3c..44040ad3b61 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -38,7 +38,9 @@ TODO: -Brian */ -#ifdef __GNUC__ +#include <my_global.h> + +#ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif |