summaryrefslogtreecommitdiff
path: root/src/frame.h
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>1999-09-11 18:40:57 +0000
committerKen Raeburn <raeburn@raeburn.org>1999-09-11 18:40:57 +0000
commitee88f64dada5993b65dd1d491a106f67bd5976d8 (patch)
tree050fa2c343233eecad4df0206d4fe71e5edb401f /src/frame.h
parente35efe896b9ade614817a29cae4a1aeae84e66a1 (diff)
downloademacs-ee88f64dada5993b65dd1d491a106f67bd5976d8.tar.gz
(FOR_EACH_FRAME): Use XCAR and XCDR.
(PIXEL_X_FROM_CANON_X, PIXEL_Y_FROM_CANON_Y): Use XFLOAT_DATA.
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frame.h b/src/frame.h
index 1bbe48f55e6..cd17a35d664 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -609,8 +609,8 @@ typedef struct frame *FRAME_PTR;
#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 @@ extern Lisp_Object Vterminal_frame;
#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 @@ extern Lisp_Object Vterminal_frame;
#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