bk commit into 5.0 tree (msvensson:1.2447) BUG#25118

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-12 00:43:25+02:00, msvensson@stripped +5 -0
  Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h
   - Move marcos for __attribute__ usage to my_attribute.h and
     include that file where needed

  include/Makefile.am@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +1 -1
    Add new header file my_attribute.h

  include/m_ctype.h@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +2 -0
    Include my_attribute.h in order to use ATTRIBUTE_* macros

  include/my_attribute.h@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +63 -0
    New BitKeeper file ``include/my_attribute.h''

  include/my_attribute.h@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +0 -0

  include/my_global.h@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +1 -37
    Move the ATTRIBUTE_* macros to my_attribute.h 
    Include my_attribute.h

  include/my_sys.h@stripped, 2007-04-12 00:43:24+02:00, msvensson@stripped +0 -3
    No need to protect the inclusion of header file, it will
    protect itself

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug25118/my50-bug25118

--- 1.67/include/Makefile.am	2007-03-12 13:21:59 +01:00
+++ 1.68/include/Makefile.am	2007-04-12 00:43:24 +02:00
@@ -25,7 +25,7 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_d
 			errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			m_ctype.h $(HEADERS_GEN)
+			m_ctype.h my_attribute.h $(HEADERS_GEN)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			heap.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\

--- 1.126/include/m_ctype.h	2007-01-22 13:10:36 +01:00
+++ 1.127/include/m_ctype.h	2007-04-12 00:43:24 +02:00
@@ -21,6 +21,8 @@
 #ifndef _m_ctype_h
 #define _m_ctype_h
 
+#include <my_attribute.h>
+
 #ifdef	__cplusplus
 extern "C" {
 #endif

--- 1.194/include/my_sys.h	2007-03-20 15:34:23 +01:00
+++ 1.195/include/my_sys.h	2007-04-12 00:43:24 +02:00
@@ -31,10 +31,7 @@ extern int NEAR my_errno;		/* Last error
 #include <my_pthread.h>
 #endif
 
-#ifndef _m_ctype_h
 #include <m_ctype.h>                    /* for CHARSET_INFO */
-#endif
-
 #include <stdarg.h>
 #include <typelib.h>
 

--- 1.137/include/my_global.h	2007-03-09 06:05:04 +01:00
+++ 1.138/include/my_global.h	2007-04-12 00:43:24 +02:00
@@ -497,43 +497,7 @@ typedef unsigned short ushort;
 #define my_const_cast(A) (A)
 #endif
 
-/*
-  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
-  Some forms of __attribute__ are actually supported in earlier versions of
-  g++, but we just disable them all because we only use them to generate
-  compilation warnings.
-*/
-#ifndef __attribute__
-# if !defined(__GNUC__)
-#  define __attribute__(A)
-# elif GCC_VERSION < 2008
-#  define __attribute__(A)
-# elif defined(__cplusplus) && GCC_VERSION < 3004
-#  define __attribute__(A)
-# endif
-#endif
-
-/*
-  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
-  But that's already covered by the __attribute__ tests above, so this is
-  just a convenience macro.
-*/
-#ifndef ATTRIBUTE_FORMAT
-# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
-#endif
-
-/*
-
-   __attribute__((format(...))) on a function pointer is not supported
-   until  gcc 3.1
-*/
-#ifndef ATTRIBUTE_FORMAT_FPTR
-# if (GCC_VERSION >= 3001)
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
-# else
-#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)
-# endif /* GNUC >= 3.1 */
-#endif
+#include <my_attribute.h>
 
 /*
   Wen using the embedded library, users might run into link problems,
--- New file ---
+++ include/my_attribute.h	07/04/12 00:43:24
/* Copyright (C) 2000-2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

/*
  Helper macros used for setting different __attributes__
  on functions in a portable fashion
*/

#ifndef _my_attribute_h
#define _my_attribute_h

/*
  Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
  Some forms of __attribute__ are actually supported in earlier versions of
  g++, but we just disable them all because we only use them to generate
  compilation warnings.
*/
#ifndef __attribute__
# if !defined(__GNUC__)
#  define __attribute__(A)
# elif GCC_VERSION < 2008
#  define __attribute__(A)
# elif defined(__cplusplus) && GCC_VERSION < 3004
#  define __attribute__(A)
# endif
#endif

/*
  __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
  But that's already covered by the __attribute__ tests above, so this is
  just a convenience macro.
*/
#ifndef ATTRIBUTE_FORMAT
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
#endif

/*

   __attribute__((format(...))) on a function pointer is not supported
   until  gcc 3.1
*/
#ifndef ATTRIBUTE_FORMAT_FPTR
# if (GCC_VERSION >= 3001)
#  define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
# else
#  define ATTRIBUTE_FORMAT_FPTR(style, m, n)
# endif /* GNUC >= 3.1 */
#endif


#endif