From 4e680e166db9b2d217f071113c2876c5fe10968c Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Mon, 8 May 2006 21:55:06 +0000 Subject: [PATCH] Minor changes for NetWare. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@378 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/src/ftk.h | 2 +- ftk/src/ftkmisc.cpp | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index 40532a0..428d97c 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -2610,7 +2610,7 @@ #endif #endif - FLMUINT64 FLMAPI f_getMaxFileSize( void); + FLMUINT FLMAPI f_getMaxFileSize( void); /**************************************************************************** Desc: CPU release and sleep functions diff --git a/ftk/src/ftkmisc.cpp b/ftk/src/ftkmisc.cpp index 75b7a4d..90776bd 100644 --- a/ftk/src/ftkmisc.cpp +++ b/ftk/src/ftkmisc.cpp @@ -761,14 +761,16 @@ FLMINT FLMAPI f_strcmp( /**************************************************************************** Desc: ****************************************************************************/ -#ifdef FLM_WIN FLMINT FLMAPI f_stricmp( const char * pszStr1, const char * pszStr2) { +#ifdef FLM_WIN return( _stricmp( pszStr1, pszStr2)); -} +#else + return( stricmp( pszStr1, pszStr2)); #endif +} /**************************************************************************** Desc: @@ -784,15 +786,17 @@ FLMINT FLMAPI f_strncmp( /**************************************************************************** Desc: ****************************************************************************/ -#ifdef FLM_WIN FLMINT FLMAPI f_strnicmp( const char * pszStr1, const char * pszStr2, FLMSIZET uiLength) { +#ifdef FLM_WIN return( _strnicmp( pszStr1, pszStr2, uiLength)); -} +#else + return( strnicmp( pszStr1, pszStr2, uiLength)); #endif +} /**************************************************************************** Desc: @@ -1069,7 +1073,7 @@ IF_ThreadMgr * f_getThreadMgrPtr( void) /********************************************************************** Desc: **********************************************************************/ -FLMUINT64 FLMAPI f_getMaxFileSize( void) +FLMUINT FLMAPI f_getMaxFileSize( void) { return( gv_uiMaxFileSize); }