bk commit into 6.0-falcon tree (jas:1.2697)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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@stripped, 2007-08-23 16:52:11-04:00, jas@rowvwade. +2 -0
  Minor changes for portability.

  storage/falcon/Configuration.cpp@stripped, 2007-08-23 16:52:03-04:00, jas@rowvwade. +3 -2
    Switch Windows conditional from __WIN__ to _WIN32
    for compilation on Visual Studio 7 (aka .Net 2003).

  storage/falcon/MemoryManager.h@stripped, 2007-08-23 16:52:03-04:00, jas@rowvwade. +2 -1
    Added an "#undef new" for Netfrastructure build.

# 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:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.25/storage/falcon/Configuration.cpp	2007-08-23 16:52:33 -04:00
+++ 1.26/storage/falcon/Configuration.cpp	2007-08-23 16:52:33 -04:00
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(__WIN__)
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 
@@ -280,7 +280,8 @@
 int64 Configuration::getAvailablePhysicalMemory()
 {
 	int64 availableMemory = 0;
-#if defined(__WIN__)
+	
+#ifdef _WIN32
 	MEMORYSTATUSEX stat;
 	DWORD error = 0;
 	

--- 1.12/storage/falcon/MemoryManager.h	2007-08-23 16:52:33 -04:00
+++ 1.13/storage/falcon/MemoryManager.h	2007-08-23 16:52:33 -04:00
@@ -66,7 +66,8 @@
 
 	WINSTATIC ALWAYS_INLINE void* operator new[](size_t s, MemMgr *pool, const char *file,
int line) 
 		{ return MemMgrPoolAllocateDebug (pool, (unsigned int) s, file, line); }
-		
+
+#undef new
 #define new(arg) new(arg, THIS_FILE, __LINE__)
 #define NEW	new (THIS_FILE, __LINE__)
 #ifndef new