summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/enums.cc5
-rw-r--r--libs/rubberband/rubberband/RubberBandStretcher.h1
-rw-r--r--libs/surfaces/wiimote/wiimote.cc2
3 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 545bc078ba..6605fc2941 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -31,7 +31,8 @@
using namespace std;
using namespace PBD;
-using namespace ARDOUR;
+namespace ARDOUR
+{
void
setup_enum_writer ()
@@ -363,3 +364,5 @@ setup_enum_writer ()
REGISTER (_Track_FreezeState);
}
+
+}
diff --git a/libs/rubberband/rubberband/RubberBandStretcher.h b/libs/rubberband/rubberband/RubberBandStretcher.h
index 1e676f229d..48343c70c9 100644
--- a/libs/rubberband/rubberband/RubberBandStretcher.h
+++ b/libs/rubberband/rubberband/RubberBandStretcher.h
@@ -19,6 +19,7 @@
#define RUBBERBAND_API_MAJOR_VERSION 2
#define RUBBERBAND_API_MINOR_VERSION 0
+#include <cstddef>
#include <vector>
/**
diff --git a/libs/surfaces/wiimote/wiimote.cc b/libs/surfaces/wiimote/wiimote.cc
index af3bbc369d..f4a8047cfb 100644
--- a/libs/surfaces/wiimote/wiimote.cc
+++ b/libs/surfaces/wiimote/wiimote.cc
@@ -177,7 +177,7 @@ wiimote_discovery:
std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
while (!wiimote_handle && !main_thread_quit) {
- bdaddr = *BDADDR_ANY;
+ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
callback_thread_registered_for_ardour = false;
wiimote_handle = cwiid_open(&bdaddr, 0);