mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed OS X compile issues.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@366 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-04-27 23:27:28 +00:00
parent 0a94a042f0
commit 1c5226cf04
5 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ftk/src/ftk.h
View File

@@ -738,7 +738,7 @@
int iLine,
FLMBOOL bAssert);
void FLMAPI f_enterDebugger(
FLMINT FLMAPI f_enterDebugger(
const char * pszFile,
int iLine);

4
ftk/src/ftkerror.cpp
View File

@@ -507,7 +507,7 @@ Exit:
/****************************************************************************
Desc:
****************************************************************************/
void FLMAPI f_enterDebugger(
FLMINT FLMAPI f_enterDebugger(
const char * pszFile,
int iLine)
{
@@ -518,6 +518,8 @@ void FLMAPI f_enterDebugger(
#else
assert( 0);
#endif
return( 0);
}
/****************************************************************************

10
ftk/src/ftkftx.cpp
View File

@@ -358,10 +358,6 @@ static FLMBOOL gv_bInitialized = FALSE;
static FLMBOOL gv_bDisplayInitialized = FALSE;
static FLMUINT gv_uiInitCount = 0;
static FTX_INFO * gv_pFtxInfo = NULL;
static FLMBOOL gv_bPrivateFTX = TRUE;
static FLMBOOL gv_bShutdown = FALSE;
static FLMBOOL gv_bOptimize = FALSE;
static F_MUTEX gv_hDispMutex = F_MUTEX_NULL;
#if defined( FLM_WIN)
@@ -3581,8 +3577,8 @@ FSTATIC void ftxRefresh( void)
pszSBuf[ uiChangeEnd + 1] = '\0';
uiTempAttrib = (pucSBackAttrib [uiChangeStart] << 4) +
pucSForeAttrib [uiChangeStart];
ftxDisplaySetBackFore( pucSBackAttrib[ uiChangeStart],
pucSForeAttrib[ uiChangeStart]);
ftxDisplaySetBackFore( (eColorType)pucSBackAttrib[ uiChangeStart],
(eColorType)pucSForeAttrib[ uiChangeStart]);
ftxDisplayStrOut( &(pszSBuf[ uiChangeStart]), uiTempAttrib);
pszSBuf[ uiChangeEnd + 1] = uiSaveChar;
}
@@ -5299,7 +5295,7 @@ FSTATIC void ftxUnixDisplayInit( void)
flm2curses[ FLM_GREEN] = COLOR_GREEN;
flm2curses[ FLM_CYAN] = COLOR_CYAN;
flm2curses[ FLM_RED] = COLOR_RED;
flm2curses[ FLM_MAGENTA] = COLOR_MAGENTA;
flm2curses[ FLM_PURPLE] = COLOR_MAGENTA;
flm2curses[ FLM_BROWN] = COLOR_YELLOW;
flm2curses[ FLM_LIGHTGRAY] = COLOR_WHITE;

2
ftk/src/ftksem.cpp
View File

@@ -393,7 +393,7 @@ RCODE f_semWait(
Desc: Get the lock on a semaphore - p operation
****************************************************************************/
#if defined( FLM_UNIX)
FINLINE void FLMAPI f_semSignal(
void FLMAPI f_semSignal(
F_SEM hSem)
{
(void)sema_signal( (sema_t *)hSem);

38
ftk/src/ftkunix.cpp
View File

@@ -296,14 +296,14 @@ RCODE FLMAPI F_FileHdl::create(
{
RCODE rc = NE_FLM_OK;
flmAssert( m_bFileOpened == FALSE);
f_assert( m_bFileOpened == FALSE);
if( m_bDeleteOnRelease)
{
// This file handle had better not been used for another file
// before. Otherwise, we will get a memory leak.
flmAssert( m_pszFileName == NULL);
f_assert( m_pszFileName == NULL);
// Note: 'OpenOrCreate' will set m_pszFileName
@@ -353,7 +353,7 @@ RCODE FLMAPI F_FileHdl::createUnique(
char szTmpPath[ F_PATH_MAX_SIZE];
FLMUINT uiCount;
flmAssert( !m_bFileOpened);
f_assert( !m_bFileOpened);
f_memset( szFileName, 0, sizeof( szFileName));
if( m_bDeleteOnRelease)
@@ -361,7 +361,7 @@ RCODE FLMAPI F_FileHdl::createUnique(
// This file handle had better not been used for another file
// before. Otherwise, we will get a memory leak.
flmAssert( !m_pszFileName);
f_assert( !m_pszFileName);
}
if( !pszDirName || pszDirName[ 0] == '\0')
@@ -465,14 +465,14 @@ RCODE FLMAPI F_FileHdl::open(
{
RCODE rc = NE_FLM_OK;
flmAssert( !m_bFileOpened);
f_assert( !m_bFileOpened);
if( m_bDeleteOnRelease)
{
// This file handle had better not been used for another file
// before. Otherwise, we will get a memory leak.
flmAssert( !m_pszFileName);
f_assert( !m_pszFileName);
if( RC_BAD( rc = f_alloc( F_PATH_MAX_SIZE, &m_pszFileName)))
{
@@ -538,7 +538,7 @@ RCODE FLMAPI F_FileHdl::close( void)
if( m_bDeleteOnRelease)
{
flmAssert( m_pszFileName);
f_assert( m_pszFileName);
if( bDeleteAllowed)
{
@@ -621,8 +621,8 @@ RCODE F_FileHdl::directRead(
FLMINT iTmp;
FLMBOOL bHitEOF;
flmAssert( m_bFileOpened);
flmAssert( m_bDoDirectIO);
f_assert( m_bFileOpened);
f_assert( m_bDoDirectIO);
if( puiBytesRead)
{
@@ -677,7 +677,7 @@ RCODE F_FileHdl::directRead(
else
{
uiMaxBytesToRead = (FLMUINT)roundUpToSectorMultiple( uiBytesToRead);
flmAssert( uiMaxBytesToRead >= uiBytesToRead);
f_assert( uiMaxBytesToRead >= uiBytesToRead);
pucReadBuffer = pucDestBuffer;
}
@@ -705,7 +705,7 @@ RCODE F_FileHdl::directRead(
if( ui64ReadOffset & m_ui64NotOnSectorBoundMask)
{
pucReadBuffer += (ui64ReadOffset & m_ui64NotOnSectorBoundMask);
flmAssert( uiBytesRead >= m_uiBytesPerSector);
f_assert( uiBytesRead >= m_uiBytesPerSector);
uiBytesRead -= (FLMUINT)(ui64ReadOffset & m_ui64NotOnSectorBoundMask);
}
@@ -768,7 +768,7 @@ RCODE FLMAPI F_FileHdl::read(
RCODE rc = NE_FLM_OK;
FLMINT iBytesRead;
flmAssert( m_bFileOpened);
f_assert( m_bFileOpened);
if( m_bDoDirectIO)
{
@@ -919,7 +919,7 @@ RCODE FLMAPI F_FileHdl::truncate(
{
RCODE rc = NE_FLM_OK;
flmAssert( m_bFileOpened);
f_assert( m_bFileOpened);
if( ftruncate( m_fd, ui64Size) == -1)
{
@@ -944,7 +944,7 @@ RCODE FLMAPI F_FileHdl::write(
RCODE rc = NE_FLM_OK;
FLMINT iBytesWritten = 0;
flmAssert( m_bFileOpened);
f_assert( m_bFileOpened);
if( m_bDoDirectIO)
{
@@ -1054,12 +1054,12 @@ RCODE F_FileHdl::directWrite(
FLMUINT uiLastWriteOffset;
FLMUINT uiLastWriteSize;
flmAssert( m_bFileOpened);
f_assert( m_bFileOpened);
#ifdef FLM_DEBUG
if( bDoAsync)
{
flmAssert( m_bCanDoAsync);
f_assert( m_bCanDoAsync);
}
#endif
@@ -1089,7 +1089,7 @@ RCODE F_FileHdl::directWrite(
// Cannot be using a temporary write buffer if we are doing
// asynchronous writes!
flmAssert( !bDoAsync || !m_bCanDoAsync);
f_assert( !bDoAsync || !m_bCanDoAsync);
if( !m_pucAlignedBuff)
{
@@ -1225,7 +1225,7 @@ RCODE F_FileHdl::directWrite(
break;
}
flmAssert( !pBufferObj);
f_assert( !pBufferObj);
pucSrcBuffer += uiBytesBeingOutput;
ui64WriteOffset += uiBytesBeingOutput;
@@ -1401,7 +1401,7 @@ FLMUINT f_getLinuxMaxFileSize( void)
#else
FLMUINT uiMaxFileSize = 0x7FF00000;
flmAssert( gv_uiLinuxMajorVer);
f_assert( gv_uiLinuxMajorVer);
// Is version 2.4 or greater?