procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(w32_to_x_font): Change prototype to fit the declaration.

Browse source 
(x_to_w32_font): Add prototype.
This commit is contained in:
Eli Zaretskii 2001-05-12 11:03:51 +00:00
parent 7689ef0b8a
commit c7501041bb
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

6
src/w32fns.c
View file

@ -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)