Commit cd215099 authored by unknown's avatar unknown

Macos 10.4 compatibility changes


include/my_global.h:
  make it compilable on mac os
ndb/src/kernel/SimBlockList.cpp:
  make it compilable with gcc 4.0
parent 648b072d
...@@ -285,7 +285,7 @@ C_MODE_END ...@@ -285,7 +285,7 @@ C_MODE_END
# endif # endif
#endif /* TIME_WITH_SYS_TIME */ #endif /* TIME_WITH_SYS_TIME */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) #if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__)
#define crypt unistd_crypt #define crypt unistd_crypt
#endif #endif
#include <unistd.h> #include <unistd.h>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#else #else
enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 }; enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 };
static
void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){ void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){
char * tmp = (char *)malloc(sz); char * tmp = (char *)malloc(sz);
......
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