From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Brown Newsgroups: gmane.emacs.bugs Subject: bug#18366: 24.3.93; Definition of strnicmp needed for Cygwin-w32 build Date: Sat, 30 Aug 2014 14:16:03 -0400 Message-ID: <540214E3.4060208@cornell.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1409422653 16855 80.91.229.3 (30 Aug 2014 18:17:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Aug 2014 18:17:33 +0000 (UTC) To: 18366@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 30 20:17:26 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XNnDJ-0000oK-2p for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Aug 2014 20:17:25 +0200 Original-Received: from localhost ([::1]:47407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnDI-0003h5-KE for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Aug 2014 14:17:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnD6-0003g0-O5 for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:17:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNnCw-0007ZF-TY for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:17:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnCw-0007ZB-Qg for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XNnCw-0001AL-Gi for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:17:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ken Brown Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 30 Aug 2014 18:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.14094226004442 (code B ref -1); Sat, 30 Aug 2014 18:17:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 Aug 2014 18:16:40 +0000 Original-Received: from localhost ([127.0.0.1]:54614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XNnCZ-00019a-Jo for submit@debbugs.gnu.org; Sat, 30 Aug 2014 14:16:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:55891) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XNnCX-00019C-8G for submit@debbugs.gnu.org; Sat, 30 Aug 2014 14:16:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNnCI-0007U6-04 for submit@debbugs.gnu.org; Sat, 30 Aug 2014 14:16:31 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:36894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnCH-0007U2-Tj for submit@debbugs.gnu.org; Sat, 30 Aug 2014 14:16:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnCA-0003d2-EX for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:16:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNnC2-0007RR-SR for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:16:14 -0400 Original-Received: from limerock04.mail.cornell.edu ([128.84.13.244]:52632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNnC2-0007RN-P1 for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2014 14:16:06 -0400 X-CornellRouted: This message has been Routed already. Original-Received: from authusersmtp.mail.cornell.edu (granite4.serverfarm.cornell.edu [10.16.197.9]) by limerock04.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id s7UIG5Ya009476 for ; Sat, 30 Aug 2014 14:16:06 -0400 Original-Received: from [192.168.1.4] (cpe-67-249-176-226.twcny.res.rr.com [67.249.176.226]) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id s7UIG4A1031012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Sat, 30 Aug 2014 14:16:05 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:92878 Archived-At: Cygwin's /usr/include/string.h, which comes from newlib, contains a definition of strnicmp; this is needed for the Cygwin-w32 build. That definition has recently been dropped from newlib, and so it will be gone in the next Cygwin release. The following patch fixes the problem. Is it OK for the release branch? === modified file 'src/cygw32.h' --- src/cygw32.h 2014-01-01 07:43:34 +0000 +++ src/cygw32.h 2014-08-30 17:51:36 +0000 @@ -33,6 +33,11 @@ #include "lisp.h" #include "coding.h" +/* The following was in /usr/include/string.h prior to Cygwin 1.7.33. */ +#ifndef strnicmp +#define strnicmp strncasecmp +#endif + extern void syms_of_cygw32 (void); extern char * w32_strerror (int error_no); === modified file 'src/w32font.c' --- src/w32font.c 2014-01-19 15:42:48 +0000 +++ src/w32font.c 2014-08-30 17:47:35 +0000 @@ -35,6 +35,8 @@ #include "w32font.h" #ifdef WINDOWSNT #include "w32.h" +#else /* CYGWIN */ +#include "cygw32.h" #endif /* Cleartype available on Windows XP, cleartype_natural from XP SP1. === modified file 'src/w32reg.c' --- src/w32reg.c 2014-01-01 07:43:34 +0000 +++ src/w32reg.c 2014-08-30 17:47:35 +0000 @@ -26,6 +26,10 @@ #include +#ifdef CYGWIN +#include "cygw32.h" +#endif + #define REG_ROOT "SOFTWARE\\GNU\\Emacs" /* Default system colors from the Display Control Panel settings. */