* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix glibmm include issues with newer glib

git-svn-id: svn://localhost/ardour2/branches/3.0@3222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-07 16:32:14 +00:00
parent e534334dce
commit a606a83d2e
11 changed files with 11 additions and 11 deletions
--- a/libs/glibmm2/glib/glibmm/convert.cc
+++ b/libs/glibmm2/glib/glibmm/convert.cc
@@ -25,7 +25,7 @@
 */

 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>

--- a/libs/glibmm2/glib/glibmm/date.cc
+++ b/libs/glibmm2/glib/glibmm/date.cc
@@ -25,7 +25,7 @@
 */

 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>

 #include <ctime>
 #include <algorithm>
--- a/libs/glibmm2/glib/glibmm/debug.h
+++ b/libs/glibmm2/glib/glibmm/debug.h
@@ -28,7 +28,7 @@

 #ifdef GLIBMM_DEBUG_REFCOUNTING

-#include <glib/gmessages.h>
+#include <glib.h>

 /* We can't use G_GNUC_PRETTY_FUNCTION because it's always disabled in C++,
 * even though __PRETTY_FUNCTION__ works fine in C++ as well if you use it
--- a/libs/glibmm2/glib/glibmm/error.cc
+++ b/libs/glibmm2/glib/glibmm/error.cc
@@ -21,7 +21,7 @@
 */

 #include <glib/gerror.h>
-#include <glib/gmessages.h>
+#include <glib.h>

 #include <map>
 #include <glibmmconfig.h>
--- a/libs/glibmm2/glib/glibmm/exception.cc
+++ b/libs/glibmm2/glib/glibmm/exception.cc
@@ -20,7 +20,7 @@
 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glibmm/exception.h>


--- a/libs/glibmm2/glib/glibmm/main.cc
+++ b/libs/glibmm2/glib/glibmm/main.cc
@@ -24,7 +24,7 @@
 #include <glibmm/wrap.h>
 #include <glibmm/iochannel.h>

-#include <glib/gmessages.h>
+#include <glib.h>
 #include <algorithm>

 GLIBMM_USING_STD(min)
--- a/libs/glibmm2/glib/glibmm/thread.cc
+++ b/libs/glibmm2/glib/glibmm/thread.cc
@@ -25,7 +25,7 @@
 */

 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>


 namespace
--- a/libs/glibmm2/glib/glibmm/timeval.cc
+++ b/libs/glibmm2/glib/glibmm/timeval.cc
@@ -21,7 +21,7 @@
 */

 #include <glib/gmain.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gtimer.h>

 #include <glibmm/timeval.h>
--- a/libs/glibmm2/glib/src/convert.ccg
+++ b/libs/glibmm2/glib/src/convert.ccg
@@ -19,7 +19,7 @@
 */

 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>

--- a/libs/glibmm2/glib/src/date.ccg
+++ b/libs/glibmm2/glib/src/date.ccg
@@ -19,7 +19,7 @@
 */

 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>

 #include <ctime>
 #include <algorithm>
--- a/libs/glibmm2/glib/src/thread.ccg
+++ b/libs/glibmm2/glib/src/thread.ccg
@@ -19,7 +19,7 @@
 */

 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>


 namespace