(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 78240a7d8ff665e903825f68c2aabf46b72814b7..998434080f72020ce148cd724c339fe23e878218 100644 (file)
--- 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 f3001649f8187f11c21d0307f32039124c345db9..113305ccc95565e3b2e3b7a17012f5d00594436e 100644 (file)
--- 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)