From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 129766 invoked by alias); 20 Sep 2017 20:30:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 129749 invoked by uid 89); 20 Sep 2017 20:30:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Sep 2017 20:30:45 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA1A146213 for ; Wed, 20 Sep 2017 20:30:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CA1A146213 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=sergiodj@redhat.com Received: from localhost (unused-10-15-17-193.yyz.redhat.com [10.15.17.193]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 823E76BF8C; Wed, 20 Sep 2017 20:30:43 +0000 (UTC) From: Sergio Durigan Junior To: Pedro Alves Cc: GDB Patches Subject: Re: [PATCH v2 1/5] Import "glob" and "getcwd" modules from gnulib References: <20170912042325.14927-1-sergiodj@redhat.com> <20170919042842.9210-1-sergiodj@redhat.com> <87y3pbwbgl.fsf@redhat.com> <0f9f2e47-dc17-0bd8-5445-0cf40160929e@redhat.com> <8760cdp9w7.fsf@redhat.com> <87shfhnrwp.fsf@redhat.com> Date: Wed, 20 Sep 2017 20:30:00 -0000 In-Reply-To: <87shfhnrwp.fsf@redhat.com> (Sergio Durigan Junior's message of "Wed, 20 Sep 2017 14:31:18 -0400") Message-ID: <87shfhdsel.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2017-09/txt/msg00517.txt.bz2 On Wednesday, September 20 2017, I wrote: > On Wednesday, September 20 2017, Pedro Alves wrote: > >> On 09/20/2017 06:17 PM, Sergio Durigan Junior wrote: >>> On Wednesday, September 20 2017, Pedro Alves wrote: >> >>>> --- a/gdb/ser-tcp.c >>>> +++ b/gdb/ser-tcp.c >>>> @@ -42,7 +42,6 @@ >>>> #ifndef ETIMEDOUT >>>> #define ETIMEDOUT WSAETIMEDOUT >>>> #endif >>>> -#define close(fd) closesocket (fd) >>>> >>>> Are you sure that the gnulib code that makes close work >>>> for sockets is enabled? I guess it will if WINDOWS_SOCKETS >>>> is defined, but it wasn't obvious to me whether it'll end >>>> up defined with the current set of modules. >>> >>> One of the dependencies of "getcwd" is the "close" module, and whenever >>> I tried to compile this patch with mingw it would fail because of this >>> re-definition of close made by ser-tcp.c. My first approach was to >>> #undef close before ser-tcp.c redefined it, but then I decided to just >>> use "close" from gnulib. I didn't know about this WINDOWS_SOCKETS >>> requirement; maybe we can define it before the inclusion of ? >>> Or maybe choose the safe side and let ser-tcp.c redefine close as >>> needed. >> >> I don't know much about WINDOWS_SOCKETS either. I just looked >> at gnulib/lib/close.c, and found: >> >> ~~~ >> /* Override close() to call into other gnulib modules. */ >> >> int >> rpl_close (int fd) >> { >> #if WINDOWS_SOCKETS >> int retval = execute_all_close_hooks (close_nothrow, fd); >> #else >> int retval = close_nothrow (fd); >> #endif >> >> #if REPLACE_FCHDIR >> if (retval >= 0) >> _gl_unregister_fd (fd); >> #endif >> >> return retval; >> } >> ~~~ >> >> >> and then figured out that there's a close_fd_maybe_socket >> close hook implemented in lib/sockets.c. >> >> static int >> close_fd_maybe_socket (const struct fd_hook *remaining_list, >> gl_close_fn primary, >> int fd) >> { >> >> This is all wrapped in #ifdef WINDOWS_SOCKETS, hence the question. >> >> It should be easy for you to determine whether WINDOWS_SOCKETS >> is defined in your mingw build, and thus whether all this code >> is part of the build or not. > > I will do that and report back. Thanks, WINDOWS_SOCKETS is not defined when building with the mingw compiler from Fedora. This means that removing that "#define" was actually not correct, because "close" will not work as expected even with gnulib. My proposal is to define "close" as it was being defined before, but actually "#undef" it if it's already defined by other headers, like: #ifdef close #undef close #endif #define close(fd) closesocket (fd) Does that work for you? -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/