database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.

Browse Source
This commit is contained in:
Jonathan Perkin
2009-08-14 17:18:52 +02:00
parent 00eec234ee
commit a162954858
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -137,6 +137,7 @@ ENDIF(MSVC)
IF(WIN32) IF(WIN32)
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
ADD_DEFINITIONS("-D_WIN32_WINNT=0x0501")
ENDIF(WIN32) ENDIF(WIN32)
# default to x86 platform. We'll check for X64 in a bit # default to x86 platform. We'll check for X64 in a bit

9
cmd-line-utils/readline/util.c
View File

@ -81,8 +81,13 @@ rl_alphabetic (c)
#if defined (HANDLE_MULTIBYTE) #if defined (HANDLE_MULTIBYTE)
int int
_rl_walphabetic (wc) /*
wchar_t wc; Portability issue with VisualAge C++ Professional / C for AIX Compiler, Version 6:
"util.c", line 84.1: 1506-343 (S) Redeclaration of _rl_walphabetic differs
from previous declaration on line 110 of "rlmbutil.h".
So, put type in the function signature here.
*/
_rl_walphabetic (wchar_t wc)
{ {
int c; int c;

18
storage/innodb_plugin/handler/i_s.cc
View File

@ -69,14 +69,16 @@ do { \
#define STRUCT_FLD(name, value) value #define STRUCT_FLD(name, value) value
#endif #endif
static const ST_FIELD_INFO END_OF_ST_FIELD_INFO = /* Don't use a static const variable here, as some C++ compilers (notably
{STRUCT_FLD(field_name, NULL), HPUX aCC: HP ANSI C++ B3910B A.03.65) can't handle it. */
STRUCT_FLD(field_length, 0), #define END_OF_ST_FIELD_INFO \
STRUCT_FLD(field_type, MYSQL_TYPE_NULL), {STRUCT_FLD(field_name, NULL), \
STRUCT_FLD(value, 0), STRUCT_FLD(field_length, 0), \
STRUCT_FLD(field_flags, 0), STRUCT_FLD(field_type, MYSQL_TYPE_NULL), \
STRUCT_FLD(old_name, ""), STRUCT_FLD(value, 0), \
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}; STRUCT_FLD(field_flags, 0), \
STRUCT_FLD(old_name, ""), \
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}
/* /*
Use the following types mapping: Use the following types mapping:

3
storage/innodb_plugin/include/univ.i
View File

@ -408,7 +408,8 @@ it is read. */
/* Minimize cache-miss latency by moving data at addr into a cache before /* Minimize cache-miss latency by moving data at addr into a cache before
it is read or written. */ it is read or written. */
# define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3) # define UNIV_PREFETCH_RW(addr) __builtin_prefetch(addr, 1, 3)
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) /* Sun Studio includes sun_prefetch.h as of version 5.9 */
#elif (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
# include <sun_prefetch.h> # include <sun_prefetch.h>
#if __SUNPRO_C >= 0x550 #if __SUNPRO_C >= 0x550
# undef UNIV_INTERN # undef UNIV_INTERN