Macos 10.4 compatibility changes

e37fbf23 · bell@sanja.is.com.ua · 77735f2f · e37fbf23 · e37fbf23
Commit e37fbf23 authored May 20, 2005 by bell@sanja.is.com.ua
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

include/my_global.h include/my_global.h +1 -1

ndb/src/kernel/SimBlockList.cpp ndb/src/kernel/SimBlockList.cpp +0 -1

No files found.
--- 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>

--- 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);