Fix non-MPS build

2 files changed, 6 insertions, 5 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 6d456850072..d056c406dee 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2083,6 +2083,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
         }
 #else
       struct Lisp_Marker **mp = &BUF_MARKERS (b);
+      struct Lisp_Marker *m;
       while ((m = *mp))
         {
           if (m->buffer == b)
@@ -2110,7 +2111,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
 #ifdef HAVE_MPS
       igc_remove_all_markers (b);
 #else
-      for (m = BUF_MARKERS (b); m; )
+      for (struct Lisp_Marker *m = BUF_MARKERS (b); m; )
         {
           struct Lisp_Marker *next = m->next;
           m->buffer = 0;
diff --git a/src/buffer.h b/src/buffer.h
index ba1b082a887..9e616693222 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -769,25 +769,25 @@ marker_it_marker (struct marker_it *it)
 INLINE struct marker_it
 marker_it_init (struct buffer *b)
 {
-  return (struct marker_it) { .markers = BUF_MARKERS (b) };
+  return (struct marker_it) { .marker = BUF_MARKERS (b) };
 }
 
 INLINE bool
 marker_it_valid (struct marker_it *it)
 {
-  return it->markers != NULL;
+  return it->marker != NULL;
 }
 
 INLINE void
 marker_it_next (struct marker_it *it)
 {
-  return it->markers = it->markers->next;
+  it->marker = it->marker->next;
 }
 
 INLINE struct Lisp_Marker *
 marker_it_marker (struct marker_it *it)
 {
-  return it->markers;
+  return it->marker;
 }
 
 # endif