Re: Bootstrapping fails on w32 now

[dhruva <dhruvakm@gmail.com>]

Hi,

> From: Jason Rumney <jasonr@gnu.org>
> Subject: Re: Bootstrapping fails on w32 now
> To: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com>
> Cc: Emacs Devel <emacs-devel@gnu.org>
> Message-ID: <487DAB3D.9080001@gnu.org>
> Content-Type: text/plain; charset=ISO-8859-1
>
> Lennart Borgman (gmail) 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
>
> w32bdf.h was removed, along with all references to it, on 26 June. It is
> very disturbing that the merge of the nextstep port has clobbered
> changes that old. How many other recent changes has it clobbered?

The following patch works for me (very few references to bdf removed).

diff --git a/src/w32gui.h b/src/w32gui.h
index d9f09e3..8f1a7e7 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -21,8 +21,6 @@ along with GNU Emacs.  If not, see
<http://www.gnu.org/licenses/>.  */
 #define EMACS_W32GUI_H
 #include <windows.h>

-#include "w32bdf.h"
-
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
@@ -47,16 +45,13 @@ enum w32_char_font_type
 {
   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;


-dhruva

-- 
Contents reflect my personal views only!