From 1856b66b512ed2fca4c50edfa1ae2e8283955883 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Mon, 24 Apr 2017 20:38:51 +0200
Subject: [PATCH] Issue 5125: Don't use SCM_CELL_WORD_1 internal

---
 lily/duration.cc | 4 ++--
 lily/pitch.cc    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lily/duration.cc b/lily/duration.cc
index 0c6fa4dd5f..880b22c46a 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -152,8 +152,8 @@ Duration::print_smob (SCM port, scm_print_state *) const
 SCM
 Duration::equal_p (SCM a, SCM b)
 {
-  Duration *p = (Duration *) SCM_CELL_WORD_1 (a);
-  Duration *q = (Duration *) SCM_CELL_WORD_1 (b);
+  Duration *p = unsmob<Duration> (a);
+  Duration *q = unsmob<Duration> (b);
 
   bool eq = p->dots_ == q->dots_
             && p->durlog_ == q->durlog_
diff --git a/lily/pitch.cc b/lily/pitch.cc
index 9e46bba70e..ee03ac44d8 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -238,8 +238,8 @@ Pitch::print_smob (SCM port, scm_print_state *) const
 SCM
 Pitch::equal_p (SCM a, SCM b)
 {
-  Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
-  Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
+  Pitch *p = unsmob<Pitch> (a);
+  Pitch *q = unsmob<Pitch> (b);
 
   bool eq = p->notename_ == q->notename_
             && p->octave_ == q->octave_
-- 
2.39.2