summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-05-26 21:01:55 +0200
committermsvensson@neptunus.(none) <>2005-05-26 21:01:55 +0200
commit697cfe7f070cd6bf5c29b0055e9fe2f181868e64 (patch)
tree32e125a96dccca5fdbf44b1f1215e4285006bdb3 /client
parent90f971ae2c17889ba89ccb5af017bd210a904428 (diff)
parent6c00006d2c4f0875054693fe9fc7a5a1fb6f75d6 (diff)
downloadmariadb-git-697cfe7f070cd6bf5c29b0055e9fe2f181868e64.tar.gz
Merge from 4.1
Diffstat (limited to 'client')
-rw-r--r--client/sql_string.cc2
-rw-r--r--client/sql_string.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc
index 0424723d97f..51f802e7465 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 2debeb61787..242b31e7ed6 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