1 files changed, 5 insertions, 2 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 3771fb35dde..d5dbc810253 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3502,10 +3502,13 @@ int
 XScreenNumberOfScreen (scr)
     register Screen *scr;
 {
-  register Display *dpy = scr->display;
-  register Screen *dpyscr = dpy->screens;
+  register Display *dpy;
+  register Screen *dpyscr;
   register int i;
 
+  dpy = scr->display;
+  dpyscr = dpy->screens;
+
   for (i = 0; i < dpy->nscreens; i++, dpyscr++)
     if (scr == dpyscr)
       return i;