From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 31 Dec 2013 21:47:15 +0000 (-0800)
Subject: move cstring and ctype patch to a quilt patch
X-Git-Tag: debian/2.18.0-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b8813f7021832ccd852b466be12d7c6abdd3fda;p=lilypond.git

move cstring and ctype patch to a quilt patch
---

diff --git a/debian/patches/use_cstring_and_ctype_includes b/debian/patches/use_cstring_and_ctype_includes
new file mode 100644
index 0000000000..60b274ab15
--- /dev/null
+++ b/debian/patches/use_cstring_and_ctype_includes
@@ -0,0 +1,67 @@
+--- lilypond-2.18.0.orig/lily/midi-stream.cc
++++ lilypond-2.18.0/lily/midi-stream.cc
+@@ -18,7 +18,7 @@
+ */
+ 
+ #include "midi-stream.hh"
+-
++#include <cstring>
+ #include <cerrno>
+ using namespace std;
+ 
+--- lilypond-2.18.0.orig/lily/piano-pedal-engraver.cc
++++ lilypond-2.18.0/lily/piano-pedal-engraver.cc
+@@ -38,6 +38,7 @@
+ #include "item.hh"
+ 
+ #include "translator.icc"
++#include <cstring>
+ 
+ #include <string.h>
+ 
+--- lilypond-2.18.0.orig/lily/prob.cc
++++ lilypond-2.18.0/lily/prob.cc
+@@ -22,7 +22,7 @@
+ #include "item.hh"
+ #include "input.hh"
+ #include "profile.hh"
+-
++#include <cstring>
+ #include "ly-smobs.icc"
+ 
+ IMPLEMENT_SMOBS (Prob);
+--- lilypond-2.18.0.orig/lily/relocate.cc
++++ lilypond-2.18.0/lily/relocate.cc
+@@ -23,8 +23,10 @@
+ 
+ /* TODO: autoconf support */
+ 
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <dirent.h>
++#include <cstring>
+ 
+ #if HAVE_GETTEXT
+ #include <libintl.h>
+--- lilypond-2.18.0.orig/lily/source-file.cc
++++ lilypond-2.18.0/lily/source-file.cc
+@@ -24,7 +24,7 @@
+ #endif /* GCC_MAJOR < 4 */
+ 
+ #include "source-file.hh"
+-
++#include <cstring>
+ #include "config.hh"
+ 
+ #include <cstdio>
+--- lilypond-2.18.0.orig/lily/translator.cc
++++ lilypond-2.18.0/lily/translator.cc
+@@ -18,7 +18,7 @@
+ */
+ 
+ #include "translator.hh"
+-
++#include <cstring>
+ #include "context-def.hh"
+ #include "dispatcher.hh"
+ #include "global-context.hh"
diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 75fe99e59f..289bb1494a 100644
--- 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;
 
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index b974673acf..c976863e02 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -38,7 +38,6 @@
 #include "item.hh"
 
 #include "translator.icc"
-#include <cstring>
 
 #include <string.h>
 
diff --git a/lily/prob.cc b/lily/prob.cc
index f6029bc439..367d1616a7 100644
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -22,7 +22,7 @@
 #include "item.hh"
 #include "input.hh"
 #include "profile.hh"
-#include <cstring>
+
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Prob);
diff --git a/lily/relocate.cc b/lily/relocate.cc
index bf670edb15..3a13f03701 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -23,10 +23,8 @@
 
 /* TODO: autoconf support */
 
-#include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <cstring>
 
 #if HAVE_GETTEXT
 #include <libintl.h>
diff --git a/lily/source-file.cc b/lily/source-file.cc
index ceca41b28e..788c78a69e 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -24,7 +24,7 @@
 #endif /* GCC_MAJOR < 4 */
 
 #include "source-file.hh"
-#include <cstring>
+
 #include "config.hh"
 
 #include <cstdio>
diff --git a/lily/translator.cc b/lily/translator.cc
index eef5e96b6f..154ffa4b08 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -18,7 +18,7 @@
 */
 
 #include "translator.hh"
-#include <cstring>
+
 #include "context-def.hh"
 #include "dispatcher.hh"
 #include "global-context.hh"