jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge from official dbus-c++ fd.org repo

Browse source 
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	configure.ac
	examples/Makefile.am
This commit is contained in:
Andreas Volz 2008-08-30 11:06:07 +02:00
commit fc54ec2a0b
17 changed files with 275 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/dbus-c++/eventloop.h
View file

@ -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