From cd2150993562ca2465a91340d5bd9f2aefd50784 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Fri, 20 May 2005 16:21:23 +0300
Subject: [PATCH] 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
---
 include/my_global.h             | 2 +-
 ndb/src/kernel/SimBlockList.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/my_global.h b/include/my_global.h
index 5448aa3e871..068832e927d 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -285,7 +285,7 @@ C_MODE_END
 # endif
 #endif /* TIME_WITH_SYS_TIME */
 #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
 #endif
 #include <unistd.h>
diff --git a/ndb/src/kernel/SimBlockList.cpp b/ndb/src/kernel/SimBlockList.cpp
index 75a52ae0c4b..bf3958cf137 100644
--- a/ndb/src/kernel/SimBlockList.cpp
+++ b/ndb/src/kernel/SimBlockList.cpp
@@ -39,7 +39,6 @@
 #else
 enum SIMBLOCKLIST_DUMMY { A_VALUE = 0 };
 
-static
 void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){
   char * tmp = (char *)malloc(sz);