a compiler must see '#pragma implementation' *before*

'#pragma interface' (that comes with the #include'd header file)

client/sql_string.cc

@@ -16,12 +16,11 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>

configure.in

@@ -1837,12 +1837,23 @@ if test "$ac_cv_sizeof_off_t" -eq 0
 then
   AC_MSG_ERROR("MySQL needs a off_t type.")
 fi
+
+# do we need #pragma interface/#pragma implementation ?
+# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
+AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
+# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't
+# follow any standard), we'll use well-defined preprocessor macros:
+AC_TRY_CPP([
+#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#error USE_PRAGMA_IMPLEMENTATION
+#endif
+],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")
+
 # This always gives a warning. Ignore it unless you are cross compiling
 AC_C_BIGENDIAN
 #---START: Used in for client configure
 # Check base type of last arg to accept
 MYSQL_TYPE_ACCEPT
-
 #---END:
 # Figure out what type of struct rlimit to use with setrlimit
 MYSQL_TYPE_STRUCT_RLIMIT

include/my_global.h

@@ -43,16 +43,11 @@
 #define HAVE_ERRNO_AS_DEFINE
 #endif /* __CYGWIN__ */
 
-/* Determine when to use "#pragma interface" */
+/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
-#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #define USE_PRAGMA_INTERFACE
 #endif
 
-/* Determine when to use "#pragma implementation" */
-#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
-#define USE_PRAGMA_IMPLEMENTATION
-#endif
-
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif

mysys/raid.cc

@@ -70,8 +70,6 @@
    tonu@mysql.com & monty@mysql.com
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION 
 #pragma implementation				// gcc: Class implementation
 #endif

sql/examples/ha_archive.cc

@@ -14,8 +14,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif

sql/examples/ha_example.cc

@@ -63,8 +63,6 @@
     -Brian
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif

sql/examples/ha_tina.cc

@@ -38,8 +38,6 @@ TODO:
  -Brian
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif

sql/field.cc

@@ -19,10 +19,11 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 #include <m_ctype.h>
 #include <errno.h>

sql/ha_berkeley.cc

@@ -47,10 +47,12 @@
 */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
+
 #ifdef HAVE_BERKELEY_DB
 #include <m_ctype.h>
 #include <myisampack.h>

sql/ha_blackhole.cc

@@ -15,11 +15,11 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
 #ifdef HAVE_BLACKHOLE_DB
 #include "ha_blackhole.h"
 

sql/ha_heap.cc

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <myisampack.h>
 #include "ha_heap.h"
 

sql/ha_innodb.cc

@@ -28,10 +28,11 @@ have disables the InnoDB inlining in this file. */
     in Windows?
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "slave.h"
 
 #ifdef HAVE_INNOBASE_DB

sql/ha_isam.cc

@@ -14,10 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_ISAM
 #include <m_ctype.h>
 #include <myisampack.h>

sql/ha_isammrg.cc

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_ISAM
 #include <m_ctype.h>
 #ifndef MASTER

sql/ha_myisam.cc

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <myisampack.h>
 #include "ha_myisam.h"

sql/ha_myisammrg.cc

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "ha_myisammrg.h"
 #ifndef MASTER

sql/ha_ndbcluster.cc

@@ -20,11 +20,12 @@
   NDB Cluster
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 #ifdef HAVE_NDBCLUSTER_DB
 #include <my_dir.h>
 #include "ha_ndbcluster.h"

sql/handler.cc

@@ -17,10 +17,11 @@
 
 /* Handler-calling-functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "ha_heap.h"
 #include "ha_myisam.h"
 #include "ha_myisammrg.h"

sql/hash_filo.cc

@@ -20,8 +20,9 @@
 ** to usage.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "hash_filo.h"

sql/item.cc

@@ -15,10 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "my_dir.h"
 

sql/item_cmpfunc.cc

@@ -17,10 +17,11 @@
 
 /* This file defines all compare functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "sql_select.h"
 

sql/item_func.cc

@@ -17,10 +17,11 @@
 
 /* This file defines all numerical functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "slave.h"				// for wait_for_master_pos
 #include <m_ctype.h>
 #include <hash.h>

sql/item_geofunc.cc

@@ -17,11 +17,11 @@
 
 /* This file defines all spatial functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
 #ifdef HAVE_SPATIAL
 #include <m_ctype.h>
 

sql/item_strfunc.cc

@@ -20,10 +20,11 @@
 ** (This shouldn't be needed)
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #ifdef HAVE_OPENSSL
 #include <openssl/des.h>

sql/item_subselect.cc

@@ -22,10 +22,11 @@ SUBSELECT TODO:
      (sql_select.h/sql_select.cc)
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 inline Item * and_items(Item* cond, Item *item)

sql/item_sum.cc

@@ -17,11 +17,12 @@
 
 /* Sum functions (COUNT, MIN...) */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 Item_sum::Item_sum(List<Item> &list)
   :arg_count(list.elements)
 {

sql/item_timefunc.cc

@@ -17,10 +17,11 @@
 
 /* This file defines all time functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <time.h>
 

sql/item_uniq.cc

@@ -16,7 +16,8 @@
 
 /* Compability file */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"

sql/log_event.cc

@@ -17,10 +17,11 @@
 
 #ifndef MYSQL_CLIENT
 
-#include  "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include  "mysql_priv.h"
 #include "slave.h"
 #include <my_dir.h>
 #endif /* MYSQL_CLIENT */

sql/opt_range.cc

@@ -23,10 +23,11 @@
 
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <nisam.h>
 #include "sql_select.h"

sql/procedure.cc

@@ -17,10 +17,11 @@
 
 /* Procedures (functions with changes output of select) */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "procedure.h"
 #include "sql_analyse.h"			// Includes procedure
 #ifdef USE_PROC_RANGE

sql/protocol.cc

@@ -19,10 +19,11 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <stdarg.h>
 
 static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;

sql/protocol_cursor.cc

@@ -19,10 +19,11 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <mysql.h>
 
 bool Protocol_cursor::send_fields(List<Item> *list, uint flag)

sql/set_var.cc

@@ -48,10 +48,11 @@
       new attribute.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <mysql.h>
 #include "slave.h"
 #include <my_getopt.h>

sql/sql_analyse.cc

@@ -23,10 +23,11 @@
 **	 - type set is out of optimization yet
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "procedure.h"
 #include "sql_analyse.h"
 #include <m_ctype.h>

sql/sql_class.cc

@@ -22,10 +22,11 @@
 **
 *****************************************************************************/
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <sys/stat.h>
 #include <thr_alarm.h>

sql/sql_crypt.cc

@@ -23,11 +23,12 @@
  needs something like 'ssh'.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 SQL_CRYPT::SQL_CRYPT(const char *password)
 {
   ulong rand_nr[2];

sql/sql_list.cc

@@ -15,11 +15,12 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 list_node end_of_list;
 
 void free_list(I_List <i_string_pair> *list)

sql/sql_map.cc

@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #include <sys/stat.h>

sql/sql_olap.cc

@@ -28,10 +28,11 @@
 
 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 

sql/sql_select.cc

@@ -17,10 +17,11 @@
 
 /* mysql_select and join optimization */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 #include <m_ctype.h>

sql/sql_string.cc

@@ -16,10 +16,11 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#include <my_global.h>
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>

sql/sql_udf.cc

@@ -28,10 +28,11 @@
 ** dynamic functions, so this shouldn't be a real problem.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <my_pthread.h>
 
 #ifdef HAVE_DLOPEN

sql/tztime.cc

@@ -25,12 +25,11 @@
   it creates unsolved link dependencies on some platforms.
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include <my_global.h>
 #if !defined(TZINFO2SQL) && !defined(TESTTIME)
 #include "mysql_priv.h"
 #else