From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 36318 invoked by alias); 26 May 2016 17:21:13 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Received: (qmail 36304 invoked by uid 89); 26 May 2016 17:21:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_05,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=ns, H*Ad:D*gov, 20160503, 2016-05-03 X-HELO: plane.gmane.org Received: from plane.gmane.org (HELO plane.gmane.org) (80.91.229.3) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 26 May 2016 17:21:03 +0000 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1b5yxq-0000k3-SG for cygwin@cygwin.com; Thu, 26 May 2016 19:20:55 +0200 Received: from c-69-140-37-22.hsd1.md.comcast.net ([69.140.37.22]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 May 2016 19:20:54 +0200 Received: from schulman.andrew by c-69-140-37-22.hsd1.md.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 May 2016 19:20:54 +0200 To: cygwin@cygwin.com From: Andrew Schulman Subject: lftp 4.7.2 build fails in Cygwin Date: Thu, 26 May 2016 18:21:00 -0000 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Archive: encrypt X-IsSubscribed: yes X-SW-Source: 2016-05/txt/msg00331.txt.bz2 Cygwin 2.5.1 x86_64 g++ 5.3.0 In Cygwin, build of lftp 4.7.2 fails in two places: (1) /home/andrex/dev/cygwin/lftp/lftp-4.7.2-1.x86_64/src/lftp-4.7.2/src/xmalloc.h:31:38: error: expected ';', ',' or ')' before '=' token char *xstrdup(const char *s,int spare=0); ^ g++ seems not to like the default value 'spare=0' in the function declaration. The function definition (in xmalloc.cc) doesn't include the default value: char *xstrdup(const char *s,int spare) { if(!s) return (char*)xmalloc(spare); #ifdef MEM_DEBUG printf("xstrdup \"%s\"\n",s); #endif size_t len=strlen(s)+1; char *mem=(char*)xmalloc(len+spare); memcpy(mem,s,len); return mem; } I tried removing the default value from the declaration in xmalloc.h, or adding it into the definition in xmalloc.cc. But the build still failed either way. Finally I just removed the 'spare' parameter from the function, since a look through the source code shows that it's never used. The patch for that is below. But I don't know why Cygwin's g++ (5.3.0) chokes on this. The same construction was present in 4.6.5, which compiled fine in Cygwin. (2) /home/andrex/dev/cygwin/lftp/lftp-4.7.2-1.x86_64/src/lftp-4.7.2/src/xmalloc.h:32:21: error: expected ';', ',' or ')' before '&' token char *xstrset(char *&mem,const char *s); ^ /home/andrex/dev/cygwin/lftp/lftp-4.7.2-1.x86_64/src/lftp-4.7.2/src/xmalloc.h:33:21: error: expected ';', ',' or ')' before '&' token char *xstrset(char *&mem,const char *s,size_t n); ^ Here g++ doesn't like *&mem. Again I don't know why g++ chokes on this, since the same construction was present in 4.6.5, which compiled fine in Cygwin. Does anyone know the right solution for these problems? Some compiler switches I'm missing? Thanks, Andrew === diff -urN lftp-4.7.1.orig/src/xmalloc.cc lftp-4.7.1/src/xmalloc.cc --- lftp-4.7.1.orig/src/xmalloc.cc 2015-11-25 05:27:17.000000000 -0500 +++ lftp-4.7.1/src/xmalloc.cc 2016-05-03 18:09:15.709557300 -0400 @@ -83,15 +83,15 @@ free(p); } -char *xstrdup(const char *s,int spare) +char *xstrdup(const char *s) { if(!s) - return (char*)xmalloc(spare); + return 0; #ifdef MEM_DEBUG printf("xstrdup \"%s\"\n",s); #endif size_t len=strlen(s)+1; - char *mem=(char*)xmalloc(len+spare); + char *mem=(char*)xmalloc(len); memcpy(mem,s,len); return mem; } diff -urN lftp-4.7.1.orig/src/xmalloc.h lftp-4.7.1/src/xmalloc.h --- lftp-4.7.1.orig/src/xmalloc.h 2015-11-25 05:27:18.000000000 -0500 +++ lftp-4.7.1/src/xmalloc.h 2016-05-03 18:06:28.969612500 -0400 @@ -28,7 +28,7 @@ void *xmalloc(size_t); void *xrealloc(void *,size_t); -char *xstrdup(const char *s,int spare=0); +char *xstrdup(const char *s); char *xstrset(char *&mem,const char *s); char *xstrset(char *&mem,const char *s,size_t n); #define alloca_strdup(s) alloca_strdup2((s),0) -- Problem reports: http://cygwin.com/problems.html FAQ: http://cygwin.com/faq/ Documentation: http://cygwin.com/docs.html Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple