aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-05-12 11:03:51 +0000
committerEli Zaretskii2001-05-12 11:03:51 +0000
commitc7501041bb57fe2a0a7cf0d0d9c7b5be93d5288d (patch)
treea0b18afd412bee3a20053fbcbe3784cda2a0dfaf /src
parent7689ef0b8aee766803f57ea3869fe62e6075ffe5 (diff)
downloademacs-c7501041bb57fe2a0a7cf0d0d9c7b5be93d5288d.tar.gz
emacs-c7501041bb57fe2a0a7cf0d0d9c7b5be93d5288d.zip
(w32_to_x_font): Change prototype to fit the declaration.
(x_to_w32_font): Add prototype.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 78240a7d8ff..998434080f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12001-05-12 Eli Zaretskii <eliz@is.elta.co.il> 12001-05-12 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * w32fns.c (w32_to_x_font): Change prototype to fit the
4 declaration.
5 (x_to_w32_font): Add prototype.
6
3 * regex.c (malloc, realloc, free) [emacs]: Undefine before 7 * regex.c (malloc, realloc, free) [emacs]: Undefine before
4 redefining, to avoid compiler warnings. 8 redefining, to avoid compiler warnings.
5 9
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. */
32#include "charset.h" 32#include "charset.h"
33#include "dispextern.h" 33#include "dispextern.h"
34#include "w32term.h" 34#include "w32term.h"
35#include "keyboard.h"
35#include "frame.h" 36#include "frame.h"
36#include "window.h" 37#include "window.h"
37#include "buffer.h" 38#include "buffer.h"
38#include "fontset.h" 39#include "fontset.h"
39#include "intervals.h" 40#include "intervals.h"
40#include "keyboard.h"
41#include "blockinput.h" 41#include "blockinput.h"
42#include "epaths.h" 42#include "epaths.h"
43#include "w32heap.h" 43#include "w32heap.h"
@@ -5518,7 +5518,9 @@ char * xlfd_charset_of_font (char * fontname)
5518struct font_info *w32_load_bdf_font (struct frame *f, char *fontname, 5518struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
5519 int size, char* filename); 5519 int size, char* filename);
5520static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names); 5520static Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names);
5521BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len, char * charset); 5521static BOOL w32_to_x_font (LOGFONT * lplf, char * lpxstr, int len,
5522 char * charset);
5523static BOOL x_to_w32_font (char *lpxstr, LOGFONT *lplogfont);
5522 5524
5523static struct font_info * 5525static struct font_info *
5524w32_load_system_font (f,fontname,size) 5526w32_load_system_font (f,fontname,size)