From dbee121675dffce3e14c667f0598da22c0af57df Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 19 Jul 2006 16:21:22 +0000 Subject: [PATCH] FTK change. Moved include of dlfcn.h closer to the top of the file (so it is included before it is first needed). git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@675 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/src/ftkmem.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ftk/src/ftkmem.cpp b/ftk/src/ftkmem.cpp index 8a15ed1..20dd7da 100644 --- a/ftk/src/ftkmem.cpp +++ b/ftk/src/ftkmem.cpp @@ -83,6 +83,10 @@ #endif #endif +#if defined( FLM_UNIX) && !defined( FLM_OSX) + #include +#endif + /************************************************************************ Desc: *************************************************************************/ @@ -2237,9 +2241,9 @@ Desc: RCODE FLMAPI F_SlabManager::setup( FLMUINT uiPreallocSize) { - RCODE rc = NE_FLM_OK; - FLMUINT uiSysSlabSize = 0; - FLMUINT uiSlabSize = 64 * 1024; + RCODE rc = NE_FLM_OK; + FLMUINT uiSysSlabSize = 0; + FLMUINT uiSlabSize = 64 * 1024; if( RC_BAD( rc = f_mutexCreate( &m_hMutex))) { @@ -2846,7 +2850,7 @@ RCODE F_FixedAlloc::setup( FLM_SLAB_USAGE * pUsageStats, FLMUINT * puiTotalBytesAllocated) { - RCODE rc = NE_FLM_OK; + RCODE rc = NE_FLM_OK; f_assert( pSlabManager); f_assert( uiCellSize); @@ -5240,9 +5244,6 @@ Exit: } #endif -#if defined( FLM_UNIX) && !defined( FLM_OSX) - #include -#endif /**************************************************************************** The NetWare Internal Debugger encrypts all symbols by XORing each character