summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/my_global.h5
-rw-r--r--include/raid.h2
-rw-r--r--sql/examples/ha_archive.h2
-rw-r--r--sql/examples/ha_example.h2
-rw-r--r--sql/field.h2
-rw-r--r--sql/ha_berkeley.h2
-rw-r--r--sql/ha_blackhole.h2
-rw-r--r--sql/ha_heap.h2
-rw-r--r--sql/ha_innodb.h2
-rw-r--r--sql/ha_isam.h2
-rw-r--r--sql/ha_isammrg.h2
-rw-r--r--sql/ha_myisam.h2
-rw-r--r--sql/ha_myisammrg.h2
-rw-r--r--sql/ha_ndbcluster.h2
-rw-r--r--sql/handler.h2
-rw-r--r--sql/item.h2
-rw-r--r--sql/item_cmpfunc.h2
-rw-r--r--sql/item_func.h2
-rw-r--r--sql/item_geofunc.h2
-rw-r--r--sql/item_strfunc.h3
-rw-r--r--sql/item_subselect.h2
-rw-r--r--sql/item_sum.h2
-rw-r--r--sql/item_timefunc.h2
-rw-r--r--sql/opt_range.h2
-rw-r--r--sql/procedure.h2
-rw-r--r--sql/protocol.h2
-rw-r--r--sql/set_var.h2
-rw-r--r--sql/sql_class.h2
-rw-r--r--sql/sql_list.h2
-rw-r--r--sql/sql_select.h2
-rw-r--r--sql/sql_string.h2
-rw-r--r--sql/sql_udf.h2
-rw-r--r--sql/tztime.h2
33 files changed, 38 insertions, 32 deletions
diff --git a/include/my_global.h b/include/my_global.h
index bf6f3b52c4b..865078927fb 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -43,6 +43,11 @@
#define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */
+/* Determine when to use "#pragma interface" */
+#if !defined(__CYGWIN__) && !defined(__ICC) && (__GNUC__ < 3)
+#define USE_PRAGMA_INTERFACE
+#endif
+
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif
diff --git a/include/raid.h b/include/raid.h
index 04c54393e54..c840afcbaab 100644
--- a/include/raid.h
+++ b/include/raid.h
@@ -89,7 +89,7 @@ extern "C" {
#ifdef __cplusplus
}
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/examples/ha_archive.h b/sql/examples/ha_archive.h
index 855d756368d..7ab463b6661 100644
--- a/sql/examples/ha_archive.h
+++ b/sql/examples/ha_archive.h
@@ -14,7 +14,7 @@
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__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/examples/ha_example.h b/sql/examples/ha_example.h
index 3c6ce4220ee..ae72e5bb275 100644
--- a/sql/examples/ha_example.h
+++ b/sql/examples/ha_example.h
@@ -21,7 +21,7 @@
that you can implement.
*/
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/field.h b/sql/field.h
index f19771c3f9c..1d7669d540d 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -20,7 +20,7 @@
variables must declare the size_of() member function.
*/
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index 25d3e128502..1d4823bbdc0 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.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
diff --git a/sql/ha_blackhole.h b/sql/ha_blackhole.h
index b6f924e94b9..84a386e17f8 100644
--- a/sql/ha_blackhole.h
+++ b/sql/ha_blackhole.h
@@ -14,7 +14,7 @@
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__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/ha_heap.h b/sql/ha_heap.h
index f36e9f31c55..60e2e84c5d2 100644
--- a/sql/ha_heap.h
+++ b/sql/ha_heap.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
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index edf428669d8..d336811a1eb 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -21,7 +21,7 @@
Innodb
*/
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/ha_isam.h b/sql/ha_isam.h
index b3e932696cb..1f9b8eb28fe 100644
--- a/sql/ha_isam.h
+++ b/sql/ha_isam.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
diff --git a/sql/ha_isammrg.h b/sql/ha_isammrg.h
index 657e5060272..82a2e312ca3 100644
--- a/sql/ha_isammrg.h
+++ b/sql/ha_isammrg.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
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index 1e6cf2f4ada..b256d4777f9 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.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
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index 6058c32c805..3bc9c11d4be 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.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
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 7de5dd503e7..439b4855147 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -21,7 +21,7 @@
/* The class defining a handle to an NDB Cluster table */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/handler.h b/sql/handler.h
index d2f77c4149a..df623afcd79 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -17,7 +17,7 @@
/* Definitions for parameters to do with handler-routines */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item.h b/sql/item.h
index d576fbbc60a..cbb65857027 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
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 37b0674a094..bea8250de9d 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -17,7 +17,7 @@
/* compare and test functions */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item_func.h b/sql/item_func.h
index 288db3a148c..398efa837bd 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
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index 79e4f804a04..5f060416ff3 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -19,7 +19,7 @@
#ifdef HAVE_SPATIAL
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 323b52b826c..e576b2c2a7e 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -17,7 +17,8 @@
/* This file defines all string functions */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
+#error PRAGMA
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index a6e005d5d26..20ba838e61c 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -16,7 +16,7 @@
/* subselect Item */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item_sum.h b/sql/item_sum.h
index dab136e4716..22f57712694 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -17,7 +17,7 @@
/* classes for sum functions */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index cc2709bf555..1a30b24b7ce 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -17,7 +17,7 @@
/* Function items used by mysql */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 5a2044a59f4..edecdcc6282 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -20,7 +20,7 @@
#ifndef _opt_range_h
#define _opt_range_h
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/procedure.h b/sql/procedure.h
index abe50bdc0a0..0a1e9ddfa2f 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -17,7 +17,7 @@
/* When using sql procedures */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/protocol.h b/sql/protocol.h
index a3b6da55da3..32d6acccddf 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -14,7 +14,7 @@
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__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/set_var.h b/sql/set_var.h
index 080a2a95ae0..d452ba03367 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -16,7 +16,7 @@
/* Classes to support the SET command */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 703bb030ab9..fbd60373498 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -17,7 +17,7 @@
/* Classes in mysql */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/sql_list.h b/sql/sql_list.h
index be3e29b0c62..45a6b5066eb 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.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
diff --git a/sql/sql_select.h b/sql/sql_select.h
index caf4574fbec..7e69eca4683 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -17,7 +17,7 @@
/* classes to use when handling where clause */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 8dff5558120..31cdd6efb8a 100644
--- a/sql/sql_string.h
+++ b/sql/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
diff --git a/sql/sql_udf.h b/sql/sql_udf.h
index d1f99a6d232..54d2267cac5 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
diff --git a/sql/tztime.h b/sql/tztime.h
index 2214c1b29d6..e1ff71b6703 100644
--- a/sql/tztime.h
+++ b/sql/tztime.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 interface */
#endif
View Lorry Controller Status