From 1a77c362ffa790ccaa37847279bb58735986e609 Mon Sep 17 00:00:00 2001 From: dsandersoremutah Date: Mon, 12 Jun 2006 19:29:16 +0000 Subject: [PATCH] Added f_getpid call - so all applications can call it. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@546 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/src/ftk.h | 6 ++++++ ftk/src/ftksys.h | 31 ------------------------------- ftk/src/ftkthrd.cpp | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index 644660c..62286a9 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -6012,4 +6012,10 @@ FBUCKET * pHashTbl, FLMUINT uiNumBuckets); + /**************************************************************************** + Process ID Functions + ****************************************************************************/ + + FLMUINT f_getpid( void); + #endif // FTK_H diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h index c8ca64a..f87ad04 100644 --- a/ftk/src/ftksys.h +++ b/ftk/src/ftksys.h @@ -241,37 +241,6 @@ } F_INTERLOCK; #endif - /**************************************************************************** - Process ID Functions - ****************************************************************************/ - - #if defined( FLM_WIN) - - FINLINE FLMUINT f_getpid( void) - { - return _getpid(); - } - - #elif defined( FLM_UNIX) - - pid_t getpid( void); - - FINLINE FLMUINT f_getpid( void) - { - return getpid(); - } - - #elif defined( FLM_NLM) - - FINLINE FLMUINT f_getpid() - { - return( (FLMUINT)f_getNLMHandle()); - } - - #else - #error "Unsupported Platform" - #endif - /**************************************************************************** f_sprintf ****************************************************************************/ diff --git a/ftk/src/ftkthrd.cpp b/ftk/src/ftkthrd.cpp index ecd870d..42f0449 100644 --- a/ftk/src/ftkthrd.cpp +++ b/ftk/src/ftkthrd.cpp @@ -25,6 +25,10 @@ #include "ftksys.h" +#ifdef FLM_UNIX + pid_t getpid( void); +#endif + #ifdef FLM_LIBC_NLM void * threadStub( void * pvThread); @@ -1513,6 +1517,22 @@ void FLMAPI f_threadDestroy( } } +/**************************************************************************** +Desc: +****************************************************************************/ +FLMUINT f_getpid( void) +{ +#if defined( FLM_WIN) + return _getpid(); +#elif defined( FLM_UNIX) + return getpid(); +#elif defined( FLM_NLM) + return( (FLMUINT)f_getNLMHandle()); +#else + #error "Unsupported Platform" +#endif +} + /**************************************************************************** Desc: ****************************************************************************/