From: David Kastrup <dak@gnu.org>
Date: Sun, 12 Jul 2015 14:41:48 +0000 (+0200)
Subject: lily-modules.cc: rename variable interface to intrface because of GUB conflicts
X-Git-Tag: release/2.19.23-1^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a549079ac050c42292703e0903c53bdf0011d383;p=lilypond.git

lily-modules.cc: rename variable interface to intrface because of GUB conflicts
---

diff --git a/lily/lily-modules.cc b/lily/lily-modules.cc
index b5b61ee6bb..be736615d6 100644
--- a/lily/lily-modules.cc
+++ b/lily/lily-modules.cc
@@ -68,21 +68,21 @@ void
 Scm_module::import ()
 {
   assert (SCM_UNBNDP (module_));
-  SCM interface = scm_c_resolve_module (name_);
+  SCM intrface = scm_c_resolve_module (name_);
   // Using only the public interface is a voluntary form of access
   // control in GUILE.  It would be cumbersome to do so until
   // Guile_user itself is imported.
   if (SCM_MODULEP (Guile_user::module.module_))
-    interface = Guile_user::module_public_interface (interface);
+    intrface = Guile_user::module_public_interface (intrface);
   for (Variable_record *p = variables_; p;)
     {
       Variable_record *next = p->next_;
-      p->var_->import (interface, p->name_);
+      p->var_->import (intrface, p->name_);
       delete p;
       p = next;
     }
   variables_ = 0;
-  module_ = interface;
+  module_ = intrface;
 }
 
 void