(display_x_get_resource, vga_stdcolor_name): Add prototype.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7425754e0421f7c1f5325b9ce08128c8aca29510..736358ee9513a426fbcb2e5ce6df7b875f563b12 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-18  Jason Rumney  <jasonr@gnu.org>
+
+       * w32console.c: Prefix RIF functions with w32con_ to avoid
+       namespace clash with functions in term.c and w32term.c.
+
+       * w32menu.c (add_menu_item, w32_menu_display_help)
+       [USE_LISP_UNION_TYPE]: Cast from Lisp_Object using i member.
+
+       * w32term.h (display_x_get_resource, vga_stdcolor_name): Add prototype. 
+
 2004-05-18  Eli Zaretskii  <eliz@gnu.org>
 
        * lisp.h (DECL_ALIGN): Remove restriction on MS-DOS systems.

diff --git a/src/w32term.h b/src/w32term.h
index a9cdacf49d40e1c82ec82016f3507d4928992882..580ae08f772752896a835c22ffef5c23066334bb 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -252,6 +252,10 @@ extern int unibyte_display_via_language_environment;
 
 struct w32_display_info *x_display_info_for_name ();
 
+Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
+                                       Lisp_Object, Lisp_Object,
+                                       Lisp_Object, Lisp_Object));
+
 extern struct w32_display_info *w32_term_init ();
 \f
 extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
@@ -719,6 +723,8 @@ struct face;
 
 XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
 struct frame * check_x_frame (Lisp_Object);
+Lisp_Object vga_stdcolor_name (int);
+
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);