From f3c4ec7415591e0b3f563dcafb8aa41491ba5cca Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Tue, 18 May 2004 19:55:30 +0000 Subject: [PATCH] (display_x_get_resource, vga_stdcolor_name): Add prototype. --- src/ChangeLog | 10 ++++++++++ src/w32term.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 7425754e042..736358ee951 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2004-05-18 Jason Rumney + + * 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 * lisp.h (DECL_ALIGN): Remove restriction on MS-DOS systems. diff --git a/src/w32term.h b/src/w32term.h index a9cdacf49d4..580ae08f772 100644 --- 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 (); 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); -- 2.39.5