bk commit into 5.0 tree (bell:1.1846)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1846 05/05/18 13:33:36 bell@stripped +2 -0
  fix building on Max OS 10.4

  ndb/src/kernel/SimBlockList.cpp
    1.6 05/05/18 13:33:15 bell@stripped +0 -1
    make in compilable with gcc 4.0

  include/my_global.h
    1.86 05/05/18 13:33:14 bell@stripped +1 -1
    make it compilable on Mac OS

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	book.sanja.is.com.ua
# Root:	/Users/bell/mysql/bk/work-bug2-5.0

--- 1.5/ndb/src/kernel/SimBlockList.cpp	2004-06-24 12:42:22 +03:00
+++ 1.6/ndb/src/kernel/SimBlockList.cpp	2005-05-18 13:33:15 +03:00
@@ -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);
 

--- 1.85/include/my_global.h	2005-05-10 13:33:40 +03:00
+++ 1.86/include/my_global.h	2005-05-18 13:33:14 +03:00
@@ -285,7 +285,7 @@
 # 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>