[glibmm] Fix the build after modification of timer.cc
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Fix the build after modification of timer.cc
- Date: Wed, 9 Sep 2015 11:34:47 +0000 (UTC)
commit 0f734c6f0a93d79e882b6e30abf37f6a78989381
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Wed Sep 9 13:32:14 2015 +0200
Fix the build after modification of timer.cc
If glib.h is included, it must be included after glibmm.h, to give thread.h a
chance to include glib.h with G_DISABLE_DEPRECATED undefined. Bug #753271.
glib/glibmm/timer.cc | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/glib/glibmm/timer.cc b/glib/glibmm/timer.cc
index b467ddd..d991b29 100644
--- a/glib/glibmm/timer.cc
+++ b/glib/glibmm/timer.cc
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id$ */
-
/* timer.cc
*
* Copyright (C) 2002 The gtkmm Development Team
@@ -20,9 +17,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <glib.h>
#include <glibmm.h>
-
+#include <glib.h>
namespace Glib
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]