smoketest/smoketest.cxx | 3 +++ vcl/inc/unx/gtk/gtksalmenu.hxx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 2bcae2745eac9a66913152fd1cda27aaf094624d Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 15 21:41:38 2012 +0200 There is no GLIB_AVAILABLE_IN_2_28 in GLib 2.28 Change-Id: Ief126965cf02283cdb7b5f65ccf9fca28b4f9a40 diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 822d3a1..a5c9973 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -26,7 +26,7 @@ # ifndef GLIB_AVAILABLE_IN_2_32 typedef void GMenuModel; # endif -# ifndef GLIB_AVAILABLE_IN_2_28 +# if !GLIB_CHECK_VERSION(2,28,0) typedef void GActionGroup; # endif #endif commit 07b6dc8610785026860f6dfcf6aab1c4ad1f45f2 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 15 21:18:52 2012 +0200 WaE: unused parameter 'argc' and 'argv' Change-Id: Idb3c4e4be025b78288fb6c705181d7f7a88c2c9f diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 67257ea..8cfa28e 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -204,6 +204,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } +#define argc +#define argv + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits