Merge from trunk.

[bpt/emacs.git] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index a32d1c5..598d9ad 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -322,7 +322,7 @@ struct frame
     struct x_output *x;         /* xterm.h */
     struct w32_output *w32;     /* w32term.h */
     struct ns_output *ns;       /* nsterm.h */
-    EMACS_INT nothing;
+    intptr_t nothing;
   }
   output_data;