Commit 55badb12 authored by unknown's avatar unknown

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
...@@ -184,7 +184,7 @@ typedef struct my_charset_handler_st ...@@ -184,7 +184,7 @@ typedef struct my_charset_handler_st
/* Charset dependant snprintf() */ /* Charset dependant snprintf() */
int (*snprintf)(struct charset_info_st *, char *to, uint n, const char *fmt, 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, int (*long10_to_str)(struct charset_info_st *, char *to, uint n, int radix,
long int val); long int val);
int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n, int (*longlong10_to_str)(struct charset_info_st *, char *to, uint n,
......
...@@ -471,9 +471,6 @@ typedef unsigned short ushort; ...@@ -471,9 +471,6 @@ typedef unsigned short ushort;
#ifndef __attribute__ #ifndef __attribute__
# if !defined(__GNUC__) # if !defined(__GNUC__)
# define __attribute__(A) # define __attribute__(A)
# elif defined (__QNXNTO__)
/* qcc defines GNUC */
# define __attribute__(A)
# elif GCC_VERSION < 2008 # elif GCC_VERSION < 2008
# define __attribute__(A) # define __attribute__(A)
# elif defined(__cplusplus) && GCC_VERSION < 3004 # elif defined(__cplusplus) && GCC_VERSION < 3004
...@@ -490,6 +487,19 @@ typedef unsigned short ushort; ...@@ -490,6 +487,19 @@ typedef unsigned short ushort;
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n))) # define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
#endif #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, Wen using the embedded library, users might run into link problems,
duplicate declaration of __cxa_pure_virtual, solved by declaring it a duplicate declaration of __cxa_pure_virtual, solved by declaring it a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment