From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: dhruva Newsgroups: gmane.emacs.devel Subject: Re: Bootstrapping fails on w32 now Date: Wed, 16 Jul 2008 14:00:31 +0530 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1216197052 11602 80.91.229.12 (16 Jul 2008 08:30:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Jul 2008 08:30:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 16 10:31:40 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KJ2QD-0001Hy-N5 for ged-emacs-devel@m.gmane.org; Wed, 16 Jul 2008 10:31:37 +0200 Original-Received: from localhost ([127.0.0.1]:58218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJ2PL-00023A-9D for ged-emacs-devel@m.gmane.org; Wed, 16 Jul 2008 04:30:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJ2PF-00022r-De for emacs-devel@gnu.org; Wed, 16 Jul 2008 04:30:37 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJ2PE-00022M-OF for emacs-devel@gnu.org; Wed, 16 Jul 2008 04:30:36 -0400 Original-Received: from [199.232.76.173] (port=39737 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJ2PD-00022F-UI for emacs-devel@gnu.org; Wed, 16 Jul 2008 04:30:36 -0400 Original-Received: from ti-out-0910.google.com ([209.85.142.185]:48258) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KJ2PC-0004uC-U3 for emacs-devel@gnu.org; Wed, 16 Jul 2008 04:30:36 -0400 Original-Received: by ti-out-0910.google.com with SMTP id u5so2614671tia.10 for ; Wed, 16 Jul 2008 01:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:mime-version:content-type:content-transfer-encoding :content-disposition; bh=OHquD6hO8mJJ6B5zCqYsk6qNfbjLaw7g69TQUhhyv0A=; b=D07FstEztzu15QaFGSyfSQIwlqnb0Jv0i/Hn8Ho4LEcOzfEhU6tBhTK844YjHB+Kew VC8yTiqDdUhafCzccsshYAwHPK3ORFpFB9vSnW3H1UFphN6ID5PPy9a4EIpiXSvX9lbb lj18JCbadxm8UTj06KQxTwv92bQv9t1jwgdHY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type :content-transfer-encoding:content-disposition; b=itQSJm+QV1cz1B1A5pz+KJCjMu2kvHSPd50BsaMd+nFSyZ1ittaVZKu9PtW+PZf1r4 F0SUmf00D4EAn+1cUfp7wD5wXlJx1nEBWhXoj8W5E8huAbhZyPLcl9w+H568kSiyhRxp rKnWCTOXRw4Jn8L7Sm/BfQmeS5tAulriwpyzg= Original-Received: by 10.110.47.17 with SMTP id u17mr11341746tiu.49.1216197031183; Wed, 16 Jul 2008 01:30:31 -0700 (PDT) Original-Received: by 10.110.46.18 with HTTP; Wed, 16 Jul 2008 01:30:31 -0700 (PDT) Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:100790 Archived-At: Hi, > From: Jason Rumney > Subject: Re: Bootstrapping fails on w32 now > To: "Lennart Borgman (gmail)" > Cc: Emacs Devel > 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 . */ #define EMACS_W32GUI_H #include -#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!