Switch to unified view

a/libupnpp/control/discovery.cxx b/libupnpp/control/discovery.cxx
...
...
12
 *       You should have received a copy of the GNU General Public License
12
 *       You should have received a copy of the GNU General Public License
13
 *       along with this program; if not, write to the
13
 *       along with this program; if not, write to the
14
 *       Free Software Foundation, Inc.,
14
 *       Free Software Foundation, Inc.,
15
 *       59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *       59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#include "config.h"
17
//#include "config.h"
18
18
19
#include <stdlib.h>
19
#include "discovery.hxx"
20
#include <errno.h>
21
#include <unistd.h>
22
#include <sched.h>
23
20
24
#include <iostream>
21
#include <pthread.h>                    // for pthread_cond_broadcast, etc
25
#include <map>
22
#include <sched.h>                      // for sched_yield
26
#include <functional>
23
#include <stdlib.h>                     // for free
24
#include <sys/time.h>                   // for CLOCK_REALTIME
25
#include <unistd.h>                     // for sleep
26
#include <upnp/upnp.h>                  // for Upnp_Discovery, etc
27
28
#include <functional>                   // for _Bind, bind, function, _1, etc
29
#include <iostream>                     // for operator<<, basic_ostream, etc
30
#include <map>                          // for _Rb_tree_iterator, map, etc
31
#include <utility>                      // for pair
32
#include <vector>                       // for vector
33
34
#include "description.hxx"              // for UPnPDeviceDesc, etc
35
36
#include "libupnpp/log.hxx"             // for LOGDEB1, LOGERR, LOGDEB
37
#include "libupnpp/ptmutex.hxx"         // for PTMutexLocker, PTMutexInit
38
#include "libupnpp/upnpplib.hxx"        // for LibUPnP
39
#include "libupnpp/upnpputils.hxx"      // for timespec_addnanos
40
#include "libupnpp/workqueue.hxx"       // for WorkQueue
41
27
using namespace std;
42
using namespace std;
28
using namespace std::placeholders;
43
using namespace std::placeholders;
29
30
#include <upnp/upnp.h>
31
#include <upnp/upnptools.h>
32
33
#include "libupnpp/upnpp_p.hxx"
34
#include "libupnpp/upnpputils.hxx"
35
#include "libupnpp/workqueue.hxx"
36
#include "libupnpp/upnpplib.hxx"
37
#include "libupnpp/log.hxx"
38
#include "description.hxx"
39
#include "discovery.hxx"
40
41
using namespace UPnPP;
44
using namespace UPnPP;
42
45
43
namespace UPnPClient {
46
namespace UPnPClient {
44
47
45
static UPnPDeviceDirectory *theDevDir;
48
static UPnPDeviceDirectory *theDevDir;
...
...
451
}
454
}
452
455
453
456
454
457
455
} // namespace UPnPClient
458
} // namespace UPnPClient
456