Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / src / nsterm.h

diff --git a/src/nsterm.h b/src/nsterm.h
index 806cfcc219ec9104daab545561851dd37ef993fb..e58b8493c94f9086f46256e092f9b396c97b0010 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -631,8 +631,7 @@ struct ns_output
 /* this dummy decl needed to support TTYs */
 struct x_output
 {
-  unsigned long background_pixel;
-  unsigned long foreground_pixel;
+  int unused;
 };