Commit c7501041 authored by Eli Zaretskii's avatar Eli Zaretskii

(w32_to_x_font): Change prototype to fit the declaration.

(x_to_w32_font): Add prototype.
parent 7689ef0b
2001-05-12 Eli Zaretskii <eliz@is.elta.co.il> 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 * regex.c (malloc, realloc, free) [emacs]: Undefine before
redefining, to avoid compiler warnings. redefining, to avoid compiler warnings.
......
...@@ -32,12 +32,12 @@ Boston, MA 02111-1307, USA. */ ...@@ -32,12 +32,12 @@ Boston, MA 02111-1307, USA. */
#include "charset.h" #include "charset.h"
#include "dispextern.h" #include "dispextern.h"
#include "w32term.h" #include "w32term.h"
#include "keyboard.h"
#include "frame.h" #include "frame.h"
#include "window.h" #include "window.h"
#include "buffer.h" #include "buffer.h"
#include "fontset.h" #include "fontset.h"
#include "intervals.h" #include "intervals.h"
#include "keyboard.h"
#include "blockinput.h" #include "blockinput.h"
#include "epaths.h" #include "epaths.h"
#include "w32heap.h" #include "w32heap.h"
...@@ -5518,7 +5518,9 @@ char * xlfd_charset_of_font (char * fontname) ...@@ -5518,7 +5518,9 @@ char * xlfd_charset_of_font (char * fontname)
struct font_info *w32_load_bdf_font (struct frame *f, char *fontname, struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
int size, char* filename); int size, char* filename);
static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names); 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 * static struct font_info *
w32_load_system_font (f,fontname,size) w32_load_system_font (f,fontname,size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment