slot-ref, slot-set! et al bypass "using-class" variants

[bpt/guile.git] / module / ice-9 / r5rs.scm

diff --git a/module/ice-9/r5rs.scm b/module/ice-9/r5rs.scm
index 2b40515..6432bbc 100644 (file)
--- a/module/ice-9/r5rs.scm
+++ b/module/ice-9/r5rs.scm
@@ -1,9 +1,9 @@
-;;;;   Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2000, 2001, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
-;;;; version 2.1 of the License, or (at your option) any later version.
+;;;; version 3 of the License, or (at your option) any later version.
 ;;;; 
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,9 +31,10 @@
 
              load))  
 
-(module-use! %module-public-interface (resolve-interface '(ice-9 safe-r5rs)))
+(module-use! (module-public-interface (current-module))
+             (resolve-interface '(ice-9 safe-r5rs)))
 
-(define scheme-report-interface %module-public-interface)
+(define scheme-report-interface (module-public-interface (current-module)))
 
 (define (scheme-report-environment n)
   (if (not (= n 5))