Commit d6f7a337 authored May 09, 2005 by unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

parents 24dcd86d 81c53446

include/my_global.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,11 @@
		#define HAVE_ERRNO_AS_DEFINE
		#endif /* __CYGWIN__ */

		/* Determine when to use "#pragma interface" */
		#if !defined(__CYGWIN__) && !defined(__ICC) && defined(__GNUC__) && (__GNUC__ < 3)
		#define USE_PRAGMA_INTERFACE
		#endif

		#if defined(i386) && !defined(__i386__)
		#define __i386__
		#endif

include/raid.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ extern "C" {
		#ifdef __cplusplus
		}

		#ifdef __GNUC__
		#ifdef USE_PRAGMA_INTERFACE
		#pragma interface /* gcc class implementation */
		#endif

sql/examples/ha_archive.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

sql/examples/ha_example.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		that you can implement.
		*/

		#ifdef __GNUC__
		#ifdef USE_PRAGMA_INTERFACE
		#pragma interface /* gcc class implementation */
		#endif

sql/field.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		variables must declare the size_of() member function.
		*/

		#ifdef __GNUC__
		#ifdef USE_PRAGMA_INTERFACE
		#pragma interface /* gcc class implementation */
		#endif