Incorporated changes required for Fedora 9.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1052 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2008-02-20 16:35:06 +00:00
parent 4cef3014fd
commit 0a5ab06206
3 changed files with 3 additions and 5 deletions

View File

@@ -528,14 +528,13 @@ FSTATIC RCODE flmProcessIndexedFld(
}
else
{
// uiContainerNum == 0, indexing all containers
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
uiContainerNum == pIxd->uiLastContainerIndexed &&
uiDrn > pIxd->uiLastDrnIndexed)
(uiContainerNum == pIxd->uiLastContainerIndexed &&
uiDrn > pIxd->uiLastDrnIndexed))
{
continue;
}

View File

@@ -3950,7 +3950,7 @@
} F_TMSTAMP;
#define f_timeIsLeapYear(year) \
((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
void f_timeGetSeconds(
FLMUINT * puiSeconds);

View File

@@ -200,7 +200,6 @@ Desc: Unlinks a cache block from the F_Database's new block list
void F_CachedBlock::unlinkFromNewList( void)
{
flmAssert( m_pDatabase);
flmAssert( m_ui16Flags & CA_IN_NEW_LIST);
flmAssert( m_pDatabase->m_uiNewCount);