[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bootstrapping fails on w32 now
From: |
David Robinow |
Subject: |
Re: Bootstrapping fails on w32 now |
Date: |
Tue, 15 Jul 2008 23:47:59 -0400 |
On Tue, Jul 15, 2008 at 6:28 PM, Lennart Borgman (gmail)
<address@hidden> wrote:
> The error message is
>
> gcc -I. -c -gdwarf-2 -g3 -DEMACSDEBUG -Ic:/g/include -fno-crossjumping
> -Demacs=
> 1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 -DUSE_CRT_DLL=1
> -DPURESIZE=5000000
> -o oo/i386/emacs.o emacs.c
> In file included from dispextern.h:58,
> from intervals.h:20,
> from emacs.c:56:
> w32gui.h:24:20: w32bdf.h: No such file or directory
> In file included from dispextern.h:58,
> from intervals.h:20,
> from emacs.c:56:
> w32gui.h:59: error: syntax error before "bdffont"
> w32gui.h:59: warning: no semicolon at end of struct or union
> w32gui.h:65: error: syntax error before '}' token
> w32gui.h:65: warning: data definition has no type or storage class
> make[2]: *** [oo/i386/emacs.o] Error 1
> make[2]: Leaving directory `C:/eclean/bld/emacs/src'
> make[1]: *** [bootstrap-temacs] Error 2
> make[1]: Leaving directory `C:/eclean/bld/emacs/src'
> make: *** [bootstrap-gmake] Error 2
> bootstrap-080716.tmp
>
>
>
It appears that a recent change to w32gui.h inadvertently reverted the
change that Jason made on June 26. The fix below seems to work for me.
Index: w32gui.h
===================================================================
RCS file: /sources/emacs/emacs/src/w32gui.h,v
retrieving revision 1.35
diff -u -r1.35 w32gui.h
--- w32gui.h 15 Jul 2008 18:15:17 -0000 1.35
+++ w32gui.h 16 Jul 2008 03:36:04 -0000
@@ -21,8 +21,6 @@
#define EMACS_W32GUI_H
#include <windows.h>
-#include "w32bdf.h"
-
/* Emulate XCharStruct. */
typedef struct _XCharStruct
{
@@ -47,16 +45,13 @@
{
UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
ANSI_FONT,
- UNICODE_FONT,
- BDF_1D_FONT,
- BDF_2D_FONT
+ UNICODE_FONT
};
typedef struct W32FontStruct {
enum w32_char_font_type font_type;
TEXTMETRIC tm;
HFONT hfont;
- bdffont *bdf;
int double_byte_p;
XCharStruct max_bounds;
XCharStruct scratch;