Commit 55badb12 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 

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


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Manual merge
parents 5d5ef846 61758d08

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ typedef struct my_charset_handler_st 
  

  /* Charset dependant snprintf() */

  int  (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt,

		   ...) ATTRIBUTE_FORMAT(printf, 4, 5);

		   ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);

  int  (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,

			long int val);

  int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,

include/my_global.h

+13 −3
Original line number Diff line number Diff line
@@ -471,9 +471,6 @@ typedef unsigned short ushort; 
#ifndef __attribute__

# if !defined(__GNUC__)

#  define __attribute__(A)

# elif defined (__QNXNTO__)

   /* qcc defines GNUC */

#  define __attribute__(A)

# elif GCC_VERSION < 2008

#  define __attribute__(A)

# elif defined(__cplusplus) && GCC_VERSION < 3004
@@ -490,6 +487,19 @@ typedef unsigned short ushort; 
# 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



/*

  Wen using the embedded library, users might run into link problems,

  duplicate declaration of __cxa_pure_virtual, solved by declaring it a