# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 937075257 0
# Node ID d021866088770d012447177d212f59c1b701e093
# Parent  2e3ab6dece24c72a883aace736073addf882b1d5
(FOR_EACH_FRAME): Use XCAR and XCDR.
(PIXEL_X_FROM_CANON_X, PIXEL_Y_FROM_CANON_Y): Use XFLOAT_DATA.

diff -r 2e3ab6dece24 -r d02186608877 src/frame.h
--- a/src/frame.h	Sat Sep 11 18:35:57 1999 +0000
+++ b/src/frame.h	Sat Sep 11 18:40:57 1999 +0000
@@ -609,8 +609,8 @@
 #define FOR_EACH_FRAME(list_var, frame_var)			\
   for ((list_var) = Vframe_list;				\
        (CONSP (list_var)					\
-	&& (frame_var = XCONS (list_var)->car, 1));		\
-       list_var = XCONS (list_var)->cdr)
+	&& (frame_var = XCAR (list_var), 1));		\
+       list_var = XCDR (list_var))
 
 
 extern Lisp_Object Qframep, Qframe_live_p, Qicon;
@@ -708,7 +708,7 @@
 #define PIXEL_X_FROM_CANON_X(F, X)			\
      (INTEGERP (X)					\
       ? XINT (X) * CANON_X_UNIT (F)			\
-      : (int) (XFLOAT (X)->data * CANON_X_UNIT (F)))
+      : (int) (XFLOAT_DATA (X) * CANON_X_UNIT (F)))
       
 /* Convert canonical value Y to pixels.  F is the frame whose
    canonical character height is to be used.  X must be a Lisp integer
@@ -717,7 +717,7 @@
 #define PIXEL_Y_FROM_CANON_Y(F, Y)			\
      (INTEGERP (Y)					\
       ? XINT (Y) * CANON_Y_UNIT (F)			\
-      : (int) (XFLOAT (Y)->data * CANON_Y_UNIT (F)))
+      : (int) (XFLOAT_DATA (Y) * CANON_Y_UNIT (F)))
 
 /* Convert pixel-value X to canonical units.  F is the frame whose
    canonical character width is to be used.  X is a C integer.  Result