(EMACS_CLASS): Remove.

(struct mac_display_info): Add xrdb member.
(struct mac_output): Add want_fullscreen member.

diff --git a/src/macterm.h b/src/macterm.h
index d1b991f5eef05ca5a9fa9338da4a3430b7db5fee..ba6d725b94cd633681627e512402b2dc89363c04 100644 (file)
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -53,9 +53,6 @@ Boston, MA 02111-1307, USA.  */
 #define init_process emacs_init_process
 #endif /* MAC_OSX */
 
-/* The class of this X application.  */
-#define EMACS_CLASS "Emacs"
-
 #define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b))
 
 #define RED_FROM_ULONG(color) ((color) >> 16)
@@ -128,6 +125,9 @@ struct mac_display_info
   /* The cursor to use for vertical scroll bars.  */
   Cursor vertical_scroll_bar_cursor;
 
+  /* Resource data base */
+  XrmDatabase xrdb;
+
 #if 0
   /* color palette information.  */
   int has_palette;
@@ -429,6 +429,9 @@ struct mac_output {
   /* The background for which the above relief GCs were set up.
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
+
+  /* See enum below */
+  int want_fullscreen;
 };
 
 typedef struct mac_output mac_output;