resolve merge

[lilypond.git] / lily / midi-stream.cc

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index c7a48ad706d1ee04456b214e7bf65f7e6ac34b18..dc232cb085223e6339bc478359a7bb43710b9d3b 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -18,7 +18,7 @@
 */
 
 #include "midi-stream.hh"
-
+#include <cstring>
 #include <cerrno>
 using namespace std;