# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1084910130 0
# Node ID c2e5f1d0cc849b21900aa649b1f625a98e104be2
# Parent  6817f9469688203677f6498651a98a402e6211e4
(display_x_get_resource, vga_stdcolor_name): Add prototype.

diff -r 6817f9469688 -r c2e5f1d0cc84 src/ChangeLog
--- a/src/ChangeLog	Tue May 18 19:53:08 2004 +0000
+++ b/src/ChangeLog	Tue May 18 19:55:30 2004 +0000
@@ -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 -r 6817f9469688 -r c2e5f1d0cc84 src/w32term.h
--- a/src/w32term.h	Tue May 18 19:53:08 2004 +0000
+++ b/src/w32term.h	Tue May 18 19:55:30 2004 +0000
@@ -252,6 +252,10 @@
 
 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 ();
 
 extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
@@ -719,6 +723,8 @@
 
 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);