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: Build failure on M$ (using MSVC): Patch enclosed Date: Tue, 20 May 2008 17:31:31 +0530 Message-ID: References: <48329DEC.4020904@gnu.org> <86prrhs2c5.fsf@lola.quinscape.zz> 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 1211284986 32296 80.91.229.12 (20 May 2008 12:03:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 20 May 2008 12:03:06 +0000 (UTC) Cc: Emacs Devel , Jason Rumney To: "David Kastrup" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 20 14:03:43 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 1JyQZB-0005Yk-6G for ged-emacs-devel@m.gmane.org; Tue, 20 May 2008 14:03:41 +0200 Original-Received: from localhost ([127.0.0.1]:38238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JyQYR-0002By-7u for ged-emacs-devel@m.gmane.org; Tue, 20 May 2008 08:02:55 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JyQXA-0001TR-8q for emacs-devel@gnu.org; Tue, 20 May 2008 08:01:36 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JyQX8-0001Sq-G9 for emacs-devel@gnu.org; Tue, 20 May 2008 08:01:35 -0400 Original-Received: from [199.232.76.173] (port=41950 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JyQX7-0001Sg-VC for emacs-devel@gnu.org; Tue, 20 May 2008 08:01:34 -0400 Original-Received: from ti-out-0910.google.com ([209.85.142.188]:22994) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JyQX7-0008M9-HR for emacs-devel@gnu.org; Tue, 20 May 2008 08:01:34 -0400 Original-Received: by ti-out-0910.google.com with SMTP id u5so1441671tia.10 for ; Tue, 20 May 2008 05:01: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:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=IRgYU5AJGqyYTvwsvKP8ix7pPd/OYra9KGDJ53E3s2A=; b=dEZX/1j9q2xwdpQ0bQhpnG4Rg2sZIWaV1yXb0t3zMWg06MzQOSrSH/WK3SOFdbno6Do+KPthEgRCJgkpakzLN9+nDYIy7tu/Q/RF3w1GgS89hBFvKxx/dcFB95kxLgBUIEtKrGPHbgpG4Fzi5GM0Azru1ii6PLCRZR6WdaMxElU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=wmUDYNMLdezX/2DT88v8xdNj/6p2ojQvWYBv5GKiJpNpFUr2SuU7MhVy9pwOQkb4ZWE7PKe2S9dV7tlDqjj1ZLRDQ8AL9Ws2UFQ6gPxrciKfbqNdPEQCzh/riOeYBmXh9wREk/uKoh/HN0Il8MDjHiMBvBPdbs5daf2O2EncLQc= Original-Received: by 10.110.15.9 with SMTP id 9mr1080372tio.44.1211284891323; Tue, 20 May 2008 05:01:31 -0700 (PDT) Original-Received: by 10.110.93.15 with HTTP; Tue, 20 May 2008 05:01:31 -0700 (PDT) In-Reply-To: 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:97446 Archived-At: The complete patch for fixing the build on MSVC and the infinite loop in files.el: diff --git a/lisp/files.el b/lisp/files.el index ee5efe4..48b992b 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3120,8 +3120,9 @@ If the file is in a registered project, a cons from `project-directory-alist' is returned. Otherwise this returns nil." (let ((dir (file-name-directory file)) + (prev "") (result nil)) - (while (and (not (string= dir "/")) + (while (and (not (string= dir prev)) (not result)) (cond ((setq result (assoc dir project-directory-alist)) @@ -3130,6 +3131,7 @@ Otherwise this returns nil." ((file-exists-p (expand-file-name ".dir-settings.el" dir)) (setq result (expand-file-name ".dir-settings.el" dir))) (t + (setq prev dir) (setq dir (file-name-directory (directory-file-name dir)))))) result)) diff --git a/src/font.c b/src/font.c index 4f75615..4081ef8 100644 --- a/src/font.c +++ b/src/font.c @@ -22,7 +22,14 @@ along with GNU Emacs. If not, see . */ #include #include #include +#if defined(WINDOWSNT) && !defined(__GNUC__) +#include +#ifndef strcasecmp +#define strcasecmp(a,b) stricmp(a,b) +#endif +#else #include +#endif #include #ifdef HAVE_M17N_FLT #include diff --git a/src/fontset.c b/src/fontset.c index 82e5b4e..60e14e0 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -66,6 +66,12 @@ along with GNU Emacs. If not, see . */ #define xassert(X) (void) 0 #endif /* not FONTSET_DEBUG */ +#if defined(WINDOWSNT) && !defined(__GNUC__) +#ifndef strcasecmp +#define strcasecmp(a,b) stricmp(a,b) +#endif +#endif + EXFUN (Fclear_face_cache, 1); /* FONTSET -dk -- Contents reflect my personal views only!