GNOME.org
 

[beast/stw] Applied patches from {debian, gentoo, ubuntu} to make beast compile.

commit efe880a68687cfa3e94ffda55adaa3784069800b
Author: Stefan Westerfeld <stefan space twc de>
Date:   Sat Oct 17 14:33:20 2009 +0200

    Applied patches from {debian, gentoo, ubuntu} to make beast compile.
    
    Only missing include statements are added. A few include files are not
    from distribution patches but from a test compile with gcc/g++-4.4.

 beast-gtk/bstmain.c             |    1 +
 beast-gtk/testgui.c             |    1 +
 birnet/birnetdebugtools.cc      |    1 +
 birnet/birnetmsg.cc             |    1 +
 birnet/birnettests.h            |    1 +
 birnet/birnetutils.cc           |    1 +
 birnet/birnetutils.hh           |    1 +
 birnet/tests/strings.cc         |    1 +
 bse/bseloader-guspatch.cc       |    1 +
 bse/bseprocidl.cc               |    1 +
 bse/bseresamplerimpl.hh         |    1 +
 bse/bsesequencer.cc             |    1 +
 bse/tests/filtertest.cc         |    2 ++
 bse/tests/firhandle.cc          |    1 +
 bse/tests/resamplehandle.cc     |    1 +
 sfi/sficxx.hh                   |    1 +
 sfi/sfidl-cxxbase.cc            |    1 +
 shell/bsescm.c                  |    1 +
 tests/bse/cxxbinding.cc         |    1 +
 tests/bse/filtertest.cc         |    1 +
 tests/latency/bselatencytest.cc |    1 +
 tests/perftest.cc               |    1 +
 tools/bsefextract.cc            |    2 ++
 tools/bseloopfuncs.c            |    1 +
 tools/bwtwave.cc                |    2 +-
 25 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/beast-gtk/bstmain.c b/beast-gtk/bstmain.c
index efe03b1..3d34aba 100644
--- a/beast-gtk/bstmain.c
+++ b/beast-gtk/bstmain.c
@@ -31,6 +31,7 @@
 #include "data/beast-images.h"
 #include <unistd.h>
 #include <string.h>
+#include <locale.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 // #include "sfi/toyprof-mem.h"
diff --git a/beast-gtk/testgui.c b/beast-gtk/testgui.c
index e4d3fae..7be7750 100644
--- a/beast-gtk/testgui.c
+++ b/beast-gtk/testgui.c
@@ -14,6 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
+#include <locale.h>
 #include "topconfig.h"
 #include "bstutils.h"
 #include "bse/bse.h"
diff --git a/birnet/birnetdebugtools.cc b/birnet/birnetdebugtools.cc
index d8b5739..e02432c 100644
--- a/birnet/birnetdebugtools.cc
+++ b/birnet/birnetdebugtools.cc
@@ -18,6 +18,7 @@
 #include "birnetthread.hh"
 #include <syslog.h>
 #include <errno.h>
+#include <stdio.h>
 
 #ifndef _ // FIXME
 #define _(x)    (x)
diff --git a/birnet/birnetmsg.cc b/birnet/birnetmsg.cc
index 0ae96ae..6dc0002 100644
--- a/birnet/birnetmsg.cc
+++ b/birnet/birnetmsg.cc
@@ -20,6 +20,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <string.h>
+#include <stdio.h>
 
 #ifndef _ // FIXME
 #define _(x)    (x)
diff --git a/birnet/birnettests.h b/birnet/birnettests.h
index 79c624f..b21ff25 100644
--- a/birnet/birnettests.h
+++ b/birnet/birnettests.h
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <string.h>
+#include <signal.h>	/* G_BREAKPOINT() */
 
 BIRNET_EXTERN_C_BEGIN();
 
diff --git a/birnet/birnetutils.cc b/birnet/birnetutils.cc
index 7d6dee3..a17f7a8 100644
--- a/birnet/birnetutils.cc
+++ b/birnet/birnetutils.cc
@@ -30,6 +30,7 @@
 #include <cxxabi.h>
 #include <signal.h>
 #include <string.h>
+#include <stdio.h>
 
 #ifndef _
 #define _(s)    s
diff --git a/birnet/birnetutils.hh b/birnet/birnetutils.hh
index fca908a..c070d0e 100644
--- a/birnet/birnetutils.hh
+++ b/birnet/birnetutils.hh
@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <cstdarg>
 
 namespace Birnet {
 
diff --git a/birnet/tests/strings.cc b/birnet/tests/strings.cc
index ad8b193..13c4db9 100644
--- a/birnet/tests/strings.cc
+++ b/birnet/tests/strings.cc
@@ -17,6 +17,7 @@
 //#define TEST_VERBOSE
 #include <birnet/birnettests.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 using namespace Birnet;
 
diff --git a/bse/bseloader-guspatch.cc b/bse/bseloader-guspatch.cc
index 9983fd9..2f798d1 100644
--- a/bse/bseloader-guspatch.cc
+++ b/bse/bseloader-guspatch.cc
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <vector>
 #include <string>
+#include <cstring>
 
 #undef  WITH_GUSPATCH_XINFOS
 static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bseprocidl.cc b/bse/bseprocidl.cc
index 8bb9424..f8fd3a6 100644
--- a/bse/bseprocidl.cc
+++ b/bse/bseprocidl.cc
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <string>
 #include <set>
+#include <cstring>
 
 std::set<std::string> needTypes;
 std::set<std::string> needClasses;
diff --git a/bse/bseresamplerimpl.hh b/bse/bseresamplerimpl.hh
index aba6356..fa2d457 100644
--- a/bse/bseresamplerimpl.hh
+++ b/bse/bseresamplerimpl.hh
@@ -21,6 +21,7 @@
 #include <bse/bseresampler.hh>
 #include <birnet/birnet.hh>
 #include <math.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #ifdef __SSE__
diff --git a/bse/bsesequencer.cc b/bse/bsesequencer.cc
index 94d57a7..d635944 100644
--- a/bse/bsesequencer.cc
+++ b/bse/bsesequencer.cc
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <string.h>
 #include <vector>
+#include <cstring>
 
 /* due to a linker/compiler bug on SuSE 9.2, we need to
  * define extern "C" symbols outside of any C++ namespace,
diff --git a/bse/tests/filtertest.cc b/bse/tests/filtertest.cc
index efe247d..f1d1110 100644
--- a/bse/tests/filtertest.cc
+++ b/bse/tests/filtertest.cc
@@ -25,6 +25,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <complex>
+#include <cstdio>
+#include <cstdlib>
 
 typedef std::complex<double> Complex;
 using namespace Birnet;
diff --git a/bse/tests/firhandle.cc b/bse/tests/firhandle.cc
index e9954f7..3db3bcf 100644
--- a/bse/tests/firhandle.cc
+++ b/bse/tests/firhandle.cc
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <complex>
 #include <vector>
+#include <cstdlib>
 
 using std::vector;
 using std::min;
diff --git a/bse/tests/resamplehandle.cc b/bse/tests/resamplehandle.cc
index 6b36286..7a99aa4 100644
--- a/bse/tests/resamplehandle.cc
+++ b/bse/tests/resamplehandle.cc
@@ -23,6 +23,7 @@
 #include <bse/bseblockutils.hh>
 #include <stdlib.h>
 #include <vector>
+#include <cstdlib>
 
 using std::vector;
 using std::max;
diff --git a/sfi/sficxx.hh b/sfi/sficxx.hh
index 38fcc72..1716ad3 100644
--- a/sfi/sficxx.hh
+++ b/sfi/sficxx.hh
@@ -22,6 +22,7 @@
 #include <string>
 #include <string.h>
 #include <new>
+#include <cstring>
 
 namespace Sfi {
 
diff --git a/sfi/sfidl-cxxbase.cc b/sfi/sfidl-cxxbase.cc
index 6afdc52..6941a23 100644
--- a/sfi/sfidl-cxxbase.cc
+++ b/sfi/sfidl-cxxbase.cc
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <cstring>
 #include "sfidl-namespace.hh"
 #include "sfidl-options.hh"
 #include "sfidl-parser.hh"
diff --git a/shell/bsescm.c b/shell/bsescm.c
index ea66808..b92c9ec 100644
--- a/shell/bsescm.c
+++ b/shell/bsescm.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <locale.h>
 #include <guile/gh.h>
 #include <bse/bse.h>
 #include <bse/bsemain.h>  /* for bse_init_textdomain_only() */
diff --git a/tests/bse/cxxbinding.cc b/tests/bse/cxxbinding.cc
index 5576086..1ca32db 100644
--- a/tests/bse/cxxbinding.cc
+++ b/tests/bse/cxxbinding.cc
@@ -16,6 +16,7 @@
  */
 #include "bsecxxapi.hh"
 #include <bse/bse.h>
+#include <cstdio>
 #include <unistd.h>
 
 static SfiGlueContext *bse_context = NULL;
diff --git a/tests/bse/filtertest.cc b/tests/bse/filtertest.cc
index 941725e..02d7f0a 100644
--- a/tests/bse/filtertest.cc
+++ b/tests/bse/filtertest.cc
@@ -27,6 +27,7 @@
 #include "topconfig.h"
 #include <errno.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 using std::string;
 using std::vector;
diff --git a/tests/latency/bselatencytest.cc b/tests/latency/bselatencytest.cc
index d0ec690..d668a84 100644
--- a/tests/latency/bselatencytest.cc
+++ b/tests/latency/bselatencytest.cc
@@ -16,6 +16,7 @@
  */
 #include "bselatencytest.genidl.hh"
 #include <sys/time.h>
+#include <cstdio>
 #include <string>
 #include <errno.h>
 
diff --git a/tests/perftest.cc b/tests/perftest.cc
index fc55b0d..c58de2d 100644
--- a/tests/perftest.cc
+++ b/tests/perftest.cc
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
+#include <cstdio>
 
 static SfiGlueContext *bse_context = NULL;
 
diff --git a/tools/bsefextract.cc b/tools/bsefextract.cc
index cd513e0..8ab9a20 100644
--- a/tools/bsefextract.cc
+++ b/tools/bsefextract.cc
@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <assert.h>
 #include "topconfig.h"
+#include <cstring>
+#include <cstdlib>
 
 #include <map>
 #include <string>
diff --git a/tools/bseloopfuncs.c b/tools/bseloopfuncs.c
index 99afb62..2be41fc 100644
--- a/tools/bseloopfuncs.c
+++ b/tools/bseloopfuncs.c
@@ -17,6 +17,7 @@
 #include "bseloopfuncs.h"
 #include <bse/gsldatacache.h>
 #include <string.h>
+#include <signal.h>	/* G_BREAKPOINT() */
 #include <stdio.h>
 #include <math.h>
 
diff --git a/tools/bwtwave.cc b/tools/bwtwave.cc
index e245eb1..2330a84 100644
--- a/tools/bwtwave.cc
+++ b/tools/bwtwave.cc
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <vector>
 #include <map>
-
+#include <cstdio>
 
 namespace BseWaveTool {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]