diff options
| author | richard <none@none> | 2009-12-17 10:03:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 10:03:56 -0800 |
| commit | 724f5fbb7f7b101774c0cf3ff43bb98f9cc4ffc1 (patch) | |
| tree | bfb7b4009b32761f9f760f97dd97cc0697667a71 /indra/llcommon/llapp.h | |
| parent | 9ff869a6b287a2b4b8c94219584d1c7b66ebb399 (diff) | |
| parent | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rw-r--r-- | indra/llcommon/llapp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index 1a052ce62d..27a52cdd99 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -34,14 +34,18 @@ #define LL_LLAPP_H #include <map> -#include "llapr.h" #include "llrun.h" #include "llsd.h" #include "lloptioninterface.h" // Forward declarations +template <typename Type> class LLAtomic32; +typedef LLAtomic32<U32> LLAtomicU32; class LLErrorThread; class LLLiveFile; +#if LL_LINUX +typedef struct siginfo siginfo_t; +#endif typedef void (*LLAppErrorHandler)(); typedef void (*LLAppChildCallback)(int pid, bool exited, int status); @@ -202,8 +206,6 @@ public: #if !LL_WINDOWS static U32 getSigChildCount(); static void incSigChildCount(); -#else -#define getpid GetCurrentProcessId #endif static int getPid(); |