database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixes some compiler issues on AIX (

Browse Source
This commit is contained in:
Monty
2022-02-02 16:41:13 +02:00
parent df02de68f3
commit 88fb89acb7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_alarm.h
View File

@@ -31,7 +31,7 @@ extern ulong my_time_to_wait_for_lock;
#include <signal.h> #include <signal.h>
#ifdef HAVE_SIGHANDLER_T #ifdef HAVE_SIGHANDLER_T
#define sig_return sighandler_t #define sig_return sighandler_t
#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) #elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(_AIX)
typedef void (*sig_return)(int); /* Returns type from signal */ typedef void (*sig_return)(int); /* Returns type from signal */
#else #else
typedef void (*sig_return)(void); /* Returns type from signal */ typedef void (*sig_return)(void); /* Returns type from signal */

2
mysys/my_addr_resolve.c
View File

@@ -324,7 +324,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
for the base program. This is depending on if the compilation is for the base program. This is depending on if the compilation is
done with PIE or not. done with PIE or not.
*/ */
addr_offset= info.dli_fbase; addr_offset= (void*) info.dli_fbase;
#ifndef __PIE__ #ifndef __PIE__
if (strcmp(info.dli_fname, my_progname) == 0 && if (strcmp(info.dli_fname, my_progname) == 0 &&
addr_resolve((void*) my_addr_resolve, loc) == 0 && addr_resolve((void*) my_addr_resolve, loc) == 0 &&

3
mysys/my_gethwaddr.c
View File

@@ -23,6 +23,7 @@
#ifndef MAIN #ifndef MAIN
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__sun) || defined(_WIN32)
static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) static my_bool memcpy_and_test(uchar *to, uchar *from, uint len)
{ {
uint i, res= 1; uint i, res= 1;
@@ -32,6 +33,7 @@ static my_bool memcpy_and_test(uchar *to, uchar *from, uint len)
res= 0; res= 0;
return res; return res;
} }
#endif
#if defined(__APPLE__) || defined(__FreeBSD__) #if defined(__APPLE__) || defined(__FreeBSD__)
#include <net/ethernet.h> #include <net/ethernet.h>
@@ -195,4 +197,3 @@ int main(int argc __attribute__((unused)),char **argv)
return 0; return 0;
} }
#endif #endif