diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-17 13:44:42 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-17 13:44:42 +0200 |
commit | ad6b933faf5dfa8f5502969e63eccc86d2af6662 (patch) | |
tree | 5373957f8ef453af110bd70af89b87b1608a695e /threads.h | |
parent | 730c46fed808e269fa40ff542001c98228a3dd0b (diff) | |
parent | 3dc5bda6eb35f27033af2e2b25a37d74771f0a00 (diff) | |
download | rsyslog-ad6b933faf5dfa8f5502969e63eccc86d2af6662.tar.gz rsyslog-ad6b933faf5dfa8f5502969e63eccc86d2af6662.tar.bz2 rsyslog-ad6b933faf5dfa8f5502969e63eccc86d2af6662.zip |
Merge branch 'master' into tls
Diffstat (limited to 'threads.h')
-rw-r--r-- | threads.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -23,16 +23,15 @@ #ifndef THREADS_H_INCLUDED #define THREADS_H_INCLUDED - /* the thread object */ -typedef struct thrdInfo { +struct thrdInfo { pthread_mutex_t *mutTermOK; /* Is it ok to terminate that thread now? */ int bIsActive; /* Is thread running? */ int bShallStop; /* set to 1 if the thread should be stopped ? */ rsRetVal (*pUsrThrdMain)(struct thrdInfo*); /* user thread main to be called in new thread */ rsRetVal (*pAfterRun)(struct thrdInfo*); /* cleanup function */ pthread_t thrdID; -} thrdInfo_t; +}; /* prototypes */ rsRetVal thrdExit(void); |