; Merge from origin/emacs-24

[gnu-emacs] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index c905ef157371d8a586f1e2d10304621e5512e39f..467da10c3b7e8aceea55e527bead441317af5654 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -239,7 +239,7 @@ Lisp_Object display_x_get_resource (struct w32_display_info *,
 extern struct w32_display_info *w32_term_init (Lisp_Object,
                                               char *, char *);
 extern int w32_defined_color (struct frame *f, const char *color,
-                              XColor *color_def, int alloc);
+                              XColor *color_def, bool alloc_p);
 extern void x_set_window_size (struct frame *f, bool change_gravity,
                               int width, int height, bool pixelwise);
 extern int x_display_pixel_height (struct w32_display_info *);
@@ -725,6 +725,8 @@ extern BOOL parse_button (int, int, int *, int *);
 extern void w32_sys_ring_bell (struct frame *f);
 extern void x_delete_display (struct w32_display_info *dpyinfo);
 
+extern void x_query_color (struct frame *, XColor *);
+
 extern volatile int notification_buffer_in_use;
 extern BYTE file_notifications[16384];
 extern DWORD notifications_size;