Merged in changes from CVS trunk.

[gnu-emacs] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index 5bc94c832fc36a751e858d2a9b6e25b534bccc53..68967ad7d244ff8464039db63f19e06fcd7c7440 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -389,8 +389,6 @@ extern struct w32_output w32term_display;
 #define FRAME_W32_WINDOW(f) ((f)->output_data.w32->window_desc)
 #define FRAME_X_WINDOW(f) ((f)->output_data.w32->window_desc)
 
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
 #define FRAME_FONT(f) ((f)->output_data.w32->font)
 #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset)
 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)
@@ -731,3 +729,8 @@ int image_ascent P_ ((struct image *, struct face *));
    ? UNICODE_FONT                                      \
    : ((CHARSET_DIMENSION (CHAR_CHARSET ((ch))) == 1)   \
       ? BDF_1D_FONT : BDF_2D_FONT))
+
+typedef DWORD (WINAPI * ClipboardSequence_Proc) ();
+
+/* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
+   (do not change this comment) */