From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 12 May 2001 11:03:51 +0000 (+0000)
Subject: (w32_to_x_font): Change prototype to fit the declaration.
X-Git-Tag: emacs-pretest-21.0.104~520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7501041bb57fe2a0a7cf0d0d9c7b5be93d5288d;p=emacs.git

(w32_to_x_font): Change prototype to fit the declaration.
(x_to_w32_font): Add prototype.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 78240a7d8ff..998434080f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-05-12  Eli Zaretskii  <eliz@is.elta.co.il>
 
+	* w32fns.c (w32_to_x_font): Change prototype to fit the
+	declaration.
+	(x_to_w32_font): Add prototype.
+
 	* regex.c (malloc, realloc, free) [emacs]: Undefine before
 	redefining, to avoid compiler warnings.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index f3001649f81..113305ccc95 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -32,12 +32,12 @@ Boston, MA 02111-1307, USA.  */
 #include "charset.h"
 #include "dispextern.h"
 #include "w32term.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "buffer.h"
 #include "fontset.h"
 #include "intervals.h"
-#include "keyboard.h"
 #include "blockinput.h"
 #include "epaths.h"
 #include "w32heap.h"
@@ -5518,7 +5518,9 @@ char * xlfd_charset_of_font (char * fontname)
 struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
                                      int size, char* filename);
 static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names);
-BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len, char * charset);
+static BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len,
+			   char * charset);
+static BOOL x_to_w32_font (char *lpxstr, LOGFONT *lplogfont);
 
 static struct font_info *
 w32_load_system_font (f,fontname,size)