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: Thu, 22 May 2008 14:59:01 +0530 Message-ID: References: <48352F8C.5030006@gnu.org> 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 1211449574 30507 80.91.229.12 (22 May 2008 09:46:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 22 May 2008 09:46:14 +0000 (UTC) Cc: Eli Zaretskii , Stefan Monnier , emacs-devel@gnu.org To: "Jason Rumney" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 22 11:46:51 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 1Jz7Nq-0001lo-WF for ged-emacs-devel@m.gmane.org; Thu, 22 May 2008 11:46:51 +0200 Original-Received: from localhost ([127.0.0.1]:46935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jz7N6-0004dj-Ff for ged-emacs-devel@m.gmane.org; Thu, 22 May 2008 05:46:04 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jz76j-00076O-8S for emacs-devel@gnu.org; Thu, 22 May 2008 05:29:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jz76g-00075P-FZ for emacs-devel@gnu.org; Thu, 22 May 2008 05:29:07 -0400 Original-Received: from [199.232.76.173] (port=58928 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jz76e-00075G-Ts for emacs-devel@gnu.org; Thu, 22 May 2008 05:29:05 -0400 Original-Received: from ti-out-0910.google.com ([209.85.142.186]:53887) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jz76e-0006Yl-8N for emacs-devel@gnu.org; Thu, 22 May 2008 05:29:04 -0400 Original-Received: by ti-out-0910.google.com with SMTP id u5so2496018tia.10 for ; Thu, 22 May 2008 02:29:02 -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=kHxg05GdyjA98zCuIgDJEJdAFJIinlv5ZTEoN9R8Nsg=; b=guLdPE3frCtQzqs2HGsD9w1a3e+PXWK/1/yYsZji6nF6p6SqkQWwYeWEpB1eUfGq8LTURAQK71sEMRLcWNsHipaiyypATB9ckh6c/urMeOyTFP5C7EAoqNci91gZLpWnf/Ar0GXUdhxu/Darw/LxiI5wh3BxdHPlnAlHD4eLJ6A= 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=Qzxxk9+M7Dr06A8/yd/sNQEhRklziotVDcIAVvTv+yM/E4y5w3MiQvty6HsSW5H/2ZglaLdZmgU8FfQkXHqSCshM882oNPzPMFUSCDiKBmVUdHfBw2csDF7AacFLqevtTMRzYXNmo+7L60suYPpgY+cU/dbfNNLJOd0PJBpMODg= Original-Received: by 10.110.37.17 with SMTP id k17mr1411470tik.13.1211448542121; Thu, 22 May 2008 02:29:02 -0700 (PDT) Original-Received: by 10.110.90.17 with HTTP; Thu, 22 May 2008 02:29:01 -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:97511 Archived-At: Hi, The below patch fixes the string header file issue. Since there is support to either include the strings.h or string.h based on some defines, I have added them in the compiler specific files for M$. If the same is added to other platforms, we will no longer have to include string/strings header directly, which I guess was the intention in having it in src/config.h or nt/config.nt. -dhruva diff --git a/nt/gmake.defs b/nt/gmake.defs index 00ae686..5a7b28b 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -204,7 +204,7 @@ else DEBUG_CFLAGS = endif CFLAGS = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \ - $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \ + $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl -DHAVE_STRINGS_H \ $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 $(FONT_CFLAGS) diff --git a/nt/nmake.defs b/nt/nmake.defs index 7c6a518..8cf9f9e 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -142,7 +142,7 @@ DEBUG_CFLAGS = -DEMACSDEBUG DEBUG_CFLAGS = !endif CFLAGS = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \ - $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \ + $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl -DHAVE_STRING_H \ $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = $(FONT_CFLAGS) diff --git a/src/font.c b/src/font.c index 84f2a2a..42e62d5 100644 --- a/src/font.c +++ b/src/font.c @@ -22,7 +22,6 @@ along with GNU Emacs. If not, see . */ #include #include #include -#include #include #ifdef HAVE_M17N_FLT #include diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 3e043c8..b748b3b 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -510,6 +510,11 @@ extern void _DebPrint (const char *fmt, ...); #define DebPrint(stuff) #endif +#ifndef __GNUC__ +#ifndef strcasecmp +#define strcasecmp(a,b) stricmp(a,b) +#endif +#endif /* ============================================================ */ -- Contents reflect my personal views only!