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

Renamed F_NOTIFY to F_NOTIFY_LIST_ITEM to avoid a conflict on Linux.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@681 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-07-19 19:09:30 +00:00
parent cb44dbb6e3
commit 4a5ee4d53e
13 changed files with 159 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flaim/src/fsysdata.cpp
View File

@@ -311,19 +311,11 @@ FLMEXP RCODE FLMAPI FlmStartup( void)
// Set the default file open flags
#ifdef FLM_UNIX
gv_FlmSysData.uiFileOpenFlags =
FLM_IO_RDWR | FLM_IO_SH_DENYNONE;
gv_FlmSysData.uiFileCreateFlags =
gv_FlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR;
#else
gv_FlmSysData.uiFileOpenFlags =
FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT;
gv_FlmSysData.uiFileCreateFlags =
gv_FlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR;
#endif
#ifdef FLM_DBG_LOG
flmDbgLogInit();
@@ -2007,7 +1999,7 @@ Notes: The global mutex is assumed to be locked when entering the
void flmFreeFile(
FFILE * pFile)
{
F_NOTIFY * pCloseNotifies;
F_NOTIFY_LIST_ITEM * pCloseNotifies;
// See if another thread is in the process of closing
// this FFILE. It is possible for this to happen, since
@@ -2139,9 +2131,9 @@ void flmFreeFile(
// Free the log header write buffer
if( pFile->pucLogHdrWriteBuf)
if( pFile->pucLogHdrIOBuf)
{
f_freeAlignedBuffer( (void **)&pFile->pucLogHdrWriteBuf);
f_freeAlignedBuffer( (void **)&pFile->pucLogHdrIOBuf);
}
pFile->krefPool.poolFree();