Commit 88fb89ac authored by Monty's avatar Monty

Fixes some compiler issues on AIX (

parent df02de68
...@@ -31,7 +31,7 @@ extern ulong my_time_to_wait_for_lock; ...@@ -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 */
......
...@@ -324,7 +324,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc) ...@@ -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 &&
......
...@@ -23,6 +23,7 @@ ...@@ -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) ...@@ -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) ...@@ -195,4 +197,3 @@ int main(int argc __attribute__((unused)),char **argv)
return 0; return 0;
} }
#endif #endif
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