Commit 062a1b8b authored by unknown's avatar unknown
Browse files

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

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

client/sql_string.cc

+1 −2
Original line number Diff line number Diff line
@@ -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

+12 −1
Original line number Diff line number Diff line
@@ -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

+2 −7
Original line number Diff line number Diff line
@@ -43,16 +43,11 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



/* Determine when to use "#pragma interface" */

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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