From owner-freebsd-ports@FreeBSD.ORG Fri Mar 26 18:34:15 2010 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 458DD1065670; Fri, 26 Mar 2010 18:34:15 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [IPv6:2001:470:a803::1]) by mx1.freebsd.org (Postfix) with ESMTP id 884F28FC27; Fri, 26 Mar 2010 18:34:14 +0000 (UTC) Received: from mail.geekcn.org (tarsier.geekcn.org [211.166.10.233]) by tarsier.geekcn.org (Postfix) with ESMTP id 765D8A59F68; Sat, 27 Mar 2010 02:34:13 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([211.166.10.233]) by mail.geekcn.org (mail.geekcn.org [211.166.10.233]) (amavisd-new, port 10024) with LMTP id 1PuJzITjEXt2; Sat, 27 Mar 2010 02:34:07 +0800 (CST) Received: from delta.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id E3C42A59F4D; Sat, 27 Mar 2010 02:34:03 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:x-enigmail-version:openpgp:content-type; b=OjD7vZIS2jjneeWc+1QdPx5tTkVK3BFoX8KNSGqvcfCqb8iuboRe4L0hvA9gr0QdA lAPmJVUfMoDqb1RrQw3EQ== Message-ID: <4BACFE18.7010309@delphij.net> Date: Fri, 26 Mar 2010 11:34:00 -0700 From: Xin LI Organization: The Geek China Organization User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.8) Gecko/20100304 Thunderbird/3.0.3 ThunderBrowse/3.2.8.1 MIME-Version: 1.0 To: freebsd-arch@freebsd.org, ports@freebsd.org X-Enigmail-Version: 1.0.1 OpenPGP: id=3FCA37C1; url=http://www.delphij.net/delphij.asc Content-Type: multipart/mixed; boundary="------------000309060306060201000507" Cc: Alexander Logvinov , the_paya@gentoo.org Subject: [RFC] Reduce namespace pollution on zlib.h X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2010 18:34:15 -0000 This is a multi-part message in MIME format. --------------000309060306060201000507 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, The recent zlib import has added some assumption that _LARGEFILE_64_SOURCE is only defined on systems with System V style *64 interface. Moreover, I have added _FILE_OFFSET_BITS = 64 definition into zconf.h so that it would pick up the 64 bit interface properly. This unfortunately could cause some namespace pollution. As such, I would propose the attached changes to zlib headers: zconf.h: * If _LARGEFILE_64_SOURCE is defined, set __FreeBSD_LARGEFILE_64_SOURCE and undefine it, as it would break zlib.h * If _FILE_OFFSET_BITS is undefined, set __FreeBSD_FILE_OFFSET_BITS and define it as 64. zlib.h: * If __FreeBSD_LARGEFILE_64_SOURCE is defined and _LARGEFILE_64_SOURCE undefined, undefine __FreeBSD_LARGEFILE_64_SOURCE and define _LARGEFILE_64_SOURCE. * If __FreeBSD_FILE_OFFSET_BITS is defined and _FILE_OFFSET_BITS is defined, undefine both. This approach is kind of mess, though, but would avoid massive changes which I'd propose for next zlib release. Comments? Objections? Cheers, - -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBAgAGBQJLrP4XAAoJEATO+BI/yjfBk2YH/Ag38kdtjxAk0l2kdgnHPnZ7 Wf9uk+0ixgE8X2uHfkOeiVO99Ma47aFU/thS1qgXRIWqP/iQEMqOiUayubYnsCJk K8quwzEuifM0hlIPzHxgzo5/e1O6GhUdIkJVJj+T//twG2BGXziYHMye/aph0iRa kW5DEq469jBoz62N8FDn4iatZoXT5boBc0bE3GQCKJhUADbpC84vjCCHfdVx50mu x5hEO88TNaWSn4AkPgs0xPBYQNM+w6t2g/CLNfylumIUVHcSs+v8sLKrxdqqvKNx hn97KmDagy5BVaWaAFAqFclgfAVbjfa8NIaOr8egxnuVHXTzEzjHFUD7fS22Oqo= =eOpg -----END PGP SIGNATURE----- --------------000309060306060201000507 Content-Type: text/plain; name="zlib.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="zlib.diff" SW5kZXg6IGxpYi9saWJ6L3pjb25mLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGliL2xpYnovemNv bmYuaAkocmV2aXNpb24gMjA1NjUxKQorKysgbGliL2xpYnovemNvbmYuaAkod29ya2luZyBj b3B5KQpAQCAtMzc1LDYgKzM3NSwxMyBAQAogIyAgZW5kaWYKICNlbmRpZgogCisjaWYgZGVm aW5lZChfX0ZyZWVCU0RfXykgJiYgZGVmaW5lZChfTEFSR0VGSUxFNjRfU09VUkNFKQorI2lm ICFkZWZpbmVkKF9fRnJlZUJTRF9MQVJHRUZJTEU2NF9TT1VSQ0UpCisjZGVmaW5lIF9fRnJl ZUJTRF9MQVJHRUZJTEU2NF9TT1VSQ0UKKyNlbmRpZgorI3VuZGVmIF9MQVJHRUZJTEU2NF9T T1VSQ0UKKyNlbmRpZgorCiAjaWZkZWYgX0xBUkdFRklMRTY0X1NPVVJDRQogIyAgaW5jbHVk ZSA8c3lzL3R5cGVzLmg+CiAjZW5kaWYKQEAgLTM5MSw2ICszOTgsOSBAQAogI2luY2x1ZGUg PHN5cy90eXBlcy5oPgogI2RlZmluZQl6X29mZl90CW9mZl90CiAjaWZuZGVmIF9GSUxFX09G RlNFVF9CSVRTCisjaWYgIWRlZmluZWQoX19GcmVlQlNEX0ZJTEVfT0ZGU0VUX0JJVFMpCisj ZGVmaW5lIF9fRnJlZUJTRF9GSUxFX09GRlNFVF9CSVRTCisjZW5kaWYKICNkZWZpbmUgX0ZJ TEVfT0ZGU0VUX0JJVFMgNjQKICNlbmRpZgogCkluZGV4OiBsaWIvbGliei96bGliLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gbGliL2xpYnovemxpYi5oCShyZXZpc2lvbiAyMDU2NTEpCisrKyBs aWIvbGliei96bGliLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1OTcsNiArMTU5NywyMCBAQAog WkVYVEVSTiBjb25zdCB1TG9uZ2YgKiBaRVhQT1JUIGdldF9jcmNfdGFibGUgICAgT0YoKHZv aWQpKTsKIFpFWFRFUk4gaW50ICAgICAgICAgICAgWkVYUE9SVCBpbmZsYXRlVW5kZXJtaW5l IE9GKCh6X3N0cmVhbXAsIGludCkpOwogCisjaWYgZGVmaW5lZChfX0ZyZWVCU0RfTEFSR0VG SUxFNjRfU09VUkNFKQorI3VuZGVmIF9fRnJlZUJTRF9MQVJHRUZJTEU2NF9TT1VSQ0UKKyNp ZiAhZGVmaW5lZChfTEFSR0VGSUxFNjRfU09VUkNFKQorI2RlZmluZSBfTEFSR0VGSUxFNjRf U09VUkNFCisjZW5kaWYKKyNlbmRpZgorCisjaWYgZGVmaW5lZChfX0ZyZWVCU0RfRklMRV9P RkZTRVRfQklUUykKKyN1bmRlZiBfX0ZyZWVCU0RfRklMRV9PRkZTRVRfQklUUworI2lmIGRl ZmluZWQoX0ZJTEVfT0ZGU0VUX0JJVFMpCisjdW5kZWYgX0ZJTEVfT0ZGU0VUX0JJVFMKKyNl bmRpZgorI2VuZGlmCisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCg== --------------000309060306060201000507--