diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 10:17:18 +0200 |
| commit | 6625450cbeee6cd4dc0ecc7418e552833708e95c (patch) | |
| tree | 8eb6bb2d4bf667ee87df5337d87d14d992ba0c17 /runtime | |
| parent | 8ce2e3917705186cc708faa68d6b3faeebd0fa32 (diff) | |
| parent | b3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd (diff) | |
| download | rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.gz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.xz rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/srUtils.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/runtime/srUtils.h b/runtime/srUtils.h index 76d25eb2..3169fd94 100644 --- a/runtime/srUtils.h +++ b/runtime/srUtils.h @@ -93,19 +93,6 @@ int getSubString(uchar **ppSrc, char *pDst, size_t DstSize, char cSep); rsRetVal getFileSize(uchar *pszName, off_t *pSize); /* mutex operations */ -/* some macros to cancel-safe lock a mutex (it will automatically be released - * when the thread is cancelled. This needs to be done as macros because - * pthread_cleanup_push sometimes is a macro that can not be used inside a function. - * It's a bit ugly, but works well... rgerhards, 2008-01-20 - */ -#define DEFVARS_mutex_cancelsafeLock int iCancelStateSave -#define mutex_cancelsafe_lock(mut) \ - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); \ - d_pthread_mutex_lock(mut); \ - pthread_cleanup_push(mutexCancelCleanup, mut); \ - pthread_setcancelstate(iCancelStateSave, NULL); -#define mutex_cancelsafe_unlock(mut) pthread_cleanup_pop(1) - /* some useful constants */ #define DEFVARS_mutexProtection\ int bLockedOpIsLocked=0 |