diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-04 14:58:51 +0100 |
| commit | 062c1ffbdce422c0df3b5314d25d935f1bd2a9e1 (patch) | |
| tree | 4aacc6da01a86dbea578e9e54bea8db76e3bd6a4 /runtime/nsdpoll_ptcp.h | |
| parent | 75a585a7e26d4d6cf59157cf62584c139af1527c (diff) | |
| parent | 9be853a2c8d0fd7fdc415200af57493ad5a00feb (diff) | |
| download | rsyslog-69b565a95375c83b5e41aee29ca6d8b4066c0a33.tar.gz rsyslog-69b565a95375c83b5e41aee29ca6d8b4066c0a33.tar.xz rsyslog-69b565a95375c83b5e41aee29ca6d8b4066c0a33.zip | |
Merge branch 'master-tcpsrv-mt'v6.1.5
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/nsdpoll_ptcp.h')
| -rw-r--r-- | runtime/nsdpoll_ptcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/nsdpoll_ptcp.h b/runtime/nsdpoll_ptcp.h index cea2823d..dfefad1b 100644 --- a/runtime/nsdpoll_ptcp.h +++ b/runtime/nsdpoll_ptcp.h @@ -49,6 +49,7 @@ struct nsdpoll_ptcp_s { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ int efd; /* file descriptor used by epoll */ nsdpoll_epollevt_lst_t *pRoot; /* Root of the epoll event list */ + pthread_mutex_t mutEvtLst; }; /* interface is defined in nsd.h, we just implement it! */ |