Commit 6909e850 authored by Karl Heuer's avatar Karl Heuer
Browse files

(struct x_display_info): member kboard (formerly perdisplay) is now a pointer,

not an actual struct.
(get_perdisplay, get_perdisplay_macro): Deleted.
parent 32462604
......@@ -289,7 +289,9 @@ struct x_display_info
Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE,
Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL,
Xatom_ATOM_PAIR;
PERDISPLAY perdisplay;
#ifdef MULTI_KBOARD
KBOARD *kboard;
#endif
};
/* This is a chain of structures for all the X displays currently in use. */
......@@ -305,16 +307,6 @@ extern struct x_display_info *x_display_info_for_display ();
extern struct x_display_info *x_display_info_for_name ();
extern struct x_display_info *x_term_init ();
#ifdef MULTI_PERDISPLAY
/* The perdisplay structure itself has to be accessible in files that don't
need to know about X. So we'll define get_perdisplay as a function to
retrieve that structure opaquely. But sources that include this header
will automatically get the macro version, and save a function call. */
#define get_perdisplay_macro(f) (&(f)->display.x->display_info->perdisplay)
#define get_perdisplay(f) get_perdisplay_macro (f)
#endif
/* Each X frame object points to its own struct x_display object
in the display.x field. The x_display structure contains all
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment