merge with master

[ardour.git] / libs / midi++2 / midi.cc

diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc
index 7c2dc835fb3fbf5347d4d5bd2257064f939abfaf..6b5bca8a98bc870d2f92e6772e2e76bef00cd797 100644 (file)
--- a/libs/midi++2/midi.cc
+++ b/libs/midi++2/midi.cc
@@ -18,9 +18,9 @@
     $Id$
 */
 
-#include <string>
+#include <cstring>
 #include <cstdlib>
-#include <midi++/types.h>
+#include "midi++/types.h"
 
 const char *MIDI::controller_names[] = {
        "bank (0)",
@@ -158,7 +158,7 @@ MIDI::byte
 MIDI::decode_controller_name (const char *name)
 
 {
-       char *lparen;
+       const char *lparen;
        size_t len;
 
        if ((lparen = strrchr (name, '(')) != 0) {