comparison data/osc/OSCQueue.cpp @ 1221:a1b97df9962e 3.0-integration

Merge from branch msvc2015_64
author Chris Cannam
date Thu, 20 Oct 2016 11:16:22 +0100
parents 6b847a59d908
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1215:f50ded4b951c 1221:a1b97df9962e
21 #include "OSCQueue.h" 21 #include "OSCQueue.h"
22 22
23 #include "base/Profiler.h" 23 #include "base/Profiler.h"
24 24
25 #include <iostream> 25 #include <iostream>
26
27 #define OSC_MESSAGE_QUEUE_SIZE 1023
28
29 #ifdef HAVE_LIBLO
30
26 #include <unistd.h> 31 #include <unistd.h>
27
28 #define OSC_MESSAGE_QUEUE_SIZE 1023
29
30 #ifdef HAVE_LIBLO
31 32
32 void 33 void
33 OSCQueue::oscError(int num, const char *msg, const char *path) 34 OSCQueue::oscError(int num, const char *msg, const char *path)
34 { 35 {
35 cerr << "ERROR: OSCQueue::oscError: liblo server error " << num 36 cerr << "ERROR: OSCQueue::oscError: liblo server error " << num