mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix various compiler/OS compatibility errors

Browse source
This commit is contained in:
Vladislav Vaintroub 2010-01-19 16:31:21 +01:00
parent 6b596534c0
commit 8bffa163f8
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
client/mysqltest.cc
View file

@ -73,7 +73,7 @@
#define QUERY_REAP_FLAG 2
#ifndef HAVE_SETENV
#error implement our portable setenv replacement in mysys
static int setenv(const char *name, const char *value, int overwrite)
#endif
enum {
@ -9672,3 +9672,18 @@ void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING *ds_input)
delete_dynamic(&lines);
DBUG_VOID_RETURN;
}
#ifndef HAVE_SETENV
static int setenv(const char *name, const char *value, int overwrite)
{
size_t buflen= strlen(name) + strlen(value) + 2;
char *envvar= malloc(buflen);
if(!envvar)
return ENOMEM;
strcpy(envvar, name);
strcat(envvar, "=");
strcat(envvar, value);
putenv(envvar);
return 0;
}
#endif

2
config.h.cmake
View file

@ -534,7 +534,7 @@
#cmakedefine strtok_r @strtok_r@
#cmakedefine strtoll @strtoll@
#cmakedefine strtoull @strtoull@
#ifdef _WIN32
#if (_MSC_VER > 1310)
#define HAVE_SETENV
#define setenv(a,b,c) _putenv_s(a,b)
#endif

10
configure.cmake
View file

@ -284,9 +284,13 @@ IF(UNIX)
IF(NOT LIBM)
MY_SEARCH_LIBS(__infinity m LIBM)
ENDIF()
IF(NOT LIBM)
MY_SEARCH_LIBS(rint m LIBM)
ENDIF()
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
# On Solaris, use of intrinsics will screw the lib search logic
# Force using -lm, so rint etc are found.
SET(LIBM m)
ENDIF()
MY_SEARCH_LIBS(gethostbyname_r "nsl_r;nsl" LIBNSL)
MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)
MY_SEARCH_LIBS(crypt crypt LIBCRYPT)

2
mysys/typelib.c
View file

@ -326,7 +326,7 @@ my_ulonglong find_set_from_flags(const TYPELIB *lib, uint default_name,
my_ulonglong flags_to_set= 0, flags_to_clear= 0, res;
my_bool set_defaults= 0;
*err_pos= 0; // No error yet
*err_pos= 0; /* No error yet */
if (str != end)
{
const char *start= str;