diff options
| author | Andreas Volz <andreas@optolix.mittelerde> | 2008-08-30 11:06:07 +0200 |
|---|---|---|
| committer | Andreas Volz <andreas@optolix.mittelerde> | 2008-08-30 11:06:07 +0200 |
| commit | fc54ec2a0bfdbd47cc6f070084dafc39bb3b2ea4 (patch) | |
| tree | 2a294d17e6e01fd12f259b28a845c4f67525384a /include/dbus-c++/eventloop.h | |
| parent | c1970e2352896a254b852ecd0579c3560353a32c (diff) | |
| parent | 1a95b536de3492f94b4b97a20c7936781dd897e6 (diff) | |
| download | dbus-c++-fc54ec2a0bfdbd47cc6f070084dafc39bb3b2ea4.tar.gz | |
merge from official dbus-c++ fd.org repo
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++
Conflicts:
configure.ac
examples/Makefile.am
Diffstat (limited to 'include/dbus-c++/eventloop.h')
| -rw-r--r-- | include/dbus-c++/eventloop.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h index ac44a0f..edaed42 100644 --- a/include/dbus-c++/eventloop.h +++ b/include/dbus-c++/eventloop.h @@ -27,10 +27,7 @@ #include "dbus-c++-config.h" -#ifdef HAVE_PTHREAD_H #include <pthread.h> -#endif - #include <list> #include "api.h" @@ -141,15 +138,7 @@ public: private: -#if defined HAVE_PTHREAD_H - pthread_mutex_t _mutex; - -#elif defined HAVE_WIN32 - -//TODO: use a critical section - -#endif }; class DXXAPI DefaultMainLoop |