FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Cygwin build.

Browse Source
This commit is contained in:
Robert Osfield 2002-03-30 15:13:33 +00:00
parent 56cee8c711
commit 434d7b98e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osg/MemoryManager.cpp
View File

@ -59,7 +59,7 @@
#include <stdarg.h>
#include <new>
#ifndef WIN32
#if defined(__CYGWIN__) || !defined(WIN32)
#include <unistd.h>
#endif
@ -145,7 +145,7 @@ static const unsigned int paddingSize = 4;
// simply declares a forced breakpoint.
// ---------------------------------------------------------------------------------------------------------------------------------
#ifdef WIN32
#if defined(WIN32) && !defined(__CYGWIN__)
#ifdef _DEBUG
#define m_assert(x) if ((x) == false) __asm { int 3 }
#else
@ -203,7 +203,7 @@ static unsigned int reservoirBufferSize = 0;
// ---------------------------------------------------------------------------------------------------------------------------------
static void dumpLeakReport();
static void doCleanupLogOnFirstRun();
static void stressTest();
static void activateStressTest();
#ifdef OSG_USE_MEMORY_MANAGER
@ -217,6 +217,7 @@ class MemStaticTimeTracker
char *ptr;
if( (ptr = getenv("OSG_MM_STRESS_TEST")) != 0)
{
activateStressTest();
}
if( (ptr = getenv("OSG_MM_BREAK_ON_ALLOCATION")) != 0)
@ -246,7 +247,7 @@ static MemStaticTimeTracker mstt;
// Local functions only
// ---------------------------------------------------------------------------------------------------------------------------------
static void stressTest()
static void activateStressTest()
{
randomWipe = true;
alwaysValidateAll = true;