Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / lily / include / context-mod.hh

diff --git a/lily/include/context-mod.hh b/lily/include/context-mod.hh
index 665dc3b64fa0f5de286b3d627cc893bcf0f049fb..a42ec91433a26d1b807a2191d80ec7c59342e359 100644 (file)
--- a/lily/include/context-mod.hh
+++ b/lily/include/context-mod.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010--2014 Reinhold Kainhofer <reinhold@kainhofer.com>
+  Copyright (C) 2010--2015 Reinhold Kainhofer <reinhold@kainhofer.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 struct Context_mod : public Simple_smob<Context_mod>
 {
   SCM mark_smob ();
-  static int print_smob (SCM, SCM, scm_print_state *);
+  int print_smob (SCM, scm_print_state *);
   static const char type_p_name_[];
 private:
   SCM mods_;