ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #172 from raulcaj/patch-1 

Solution for Issue #170
This commit is contained in:
Kfir Itzhak 2013-09-24 13:25:15 -07:00
parent aef9ab2f00 f2225f23cd
commit 171bf4ab3f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_thread.h
View File

@ -23,13 +23,14 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
#include <syscall.h>
#include "zm_exception.h" #include "zm_exception.h"
#include "zm_utils.h" #include "zm_utils.h"
class ThreadException : public Exception class ThreadException : public Exception
{ {
public: public:
ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) ) ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
{ {
} }
}; };
@ -202,7 +203,7 @@ protected:
pid_t id() const pid_t id() const
{ {
return( (pid_t)syscall(224) ); return( (pid_t)syscall(SYS_gettid) );
} }
void exit( int status = 0 ) void exit( int status = 0 )
{ {

3
src/zm_timer.h
View File

@ -20,6 +20,7 @@
#ifndef ZM_TIMER_H #ifndef ZM_TIMER_H
#define ZM_TIMER_H #define ZM_TIMER_H
#include <syscall.h>
#include "zm_thread.h" #include "zm_thread.h"
#include "zm_exception.h" #include "zm_exception.h"
@ -30,7 +31,7 @@ private:
class TimerException : public Exception class TimerException : public Exception
{ {
public: public:
TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) ) TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
{ {
} }
}; };