From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12740 invoked by alias); 6 Feb 2014 14:41:48 -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 12728 invoked by uid 89); 6 Feb 2014 14:41:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-6.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2 X-HELO: calimero.vinschen.de Received: from aquarius.hirmke.de (HELO calimero.vinschen.de) (217.91.18.234) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 06 Feb 2014 14:41:47 +0000 Received: by calimero.vinschen.de (Postfix, from userid 500) id EC34952082E; Thu, 6 Feb 2014 15:41:44 +0100 (CET) Date: Thu, 06 Feb 2014 14:41:00 -0000 From: Corinna Vinschen To: cygwin@cygwin.com Subject: Re: cygwin-1.7.28 getpwent header declaration changes ? Message-ID: <20140206144144.GK2821@calimero.vinschen.de> Reply-To: cygwin@cygwin.com Mail-Followup-To: cygwin@cygwin.com References: <52F339CA.5070305@gmail.com> <20140206090117.GD2821@calimero.vinschen.de> <52F361C5.3000807@gmail.com> <20140206140244.GH2821@calimero.vinschen.de> <20140206142835.GJ2821@calimero.vinschen.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Gs9iBZf6UKWgztis" Content-Disposition: inline In-Reply-To: <20140206142835.GJ2821@calimero.vinschen.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2014-02/txt/msg00099.txt.bz2 --Gs9iBZf6UKWgztis Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 2018 On Feb 6 15:28, Corinna Vinschen wrote: > On Feb 6 15:15, Jan Nijtmans wrote: > > 2014-02-06 15:02 GMT+01:00 Corinna Vinschen: > > > In sys/_default_fcntl.h, the LOCK_xx macros are defined if > > > __BSD_VISIBLE is defined, which *is* defined by default, unless you > > > define one of > > > > > > _ANSI_SOURCE > > > _C99_SOURCE > > > _C11_SOURCE > > > _POSIX_C_SOURCE > > > _XOPEN_SOURCE > >=20 > > Yes, SQLite defines _XOPEN_SOURCE in sqliteInt.h: > >=20 > > > >=20 > > I could add a !defined(__CYGWIN__) there, but I prefer > > just to define __BSD_VISIBLE. >=20 > On second thought, Linux defines the LOCK_xx macros unconditionally > in sys/file.h. What we could do is to define the macros in sys/file.h > if they are not already defined because __BSD_VISIBLE wasn't set. Jan, can you please check if SQlite builds *without* defining __BSD_VISIBLE, but adding the following lines to /usr/include/sys/file.h; Index: sys/file.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/winsup/cygwin/include/sys/file.h,v retrieving revision 1.8 diff -u -p -r1.8 file.h --- sys/file.h 17 Jan 2014 11:01:46 -0000 1.8 +++ sys/file.h 6 Feb 2014 14:41:23 -0000 @@ -31,4 +31,16 @@ #define L_INCR SEEK_CUR #define L_XTND SEEK_END =20 +/* Including always defines flock & macros. */ +#if __BSD_VISIBLE - 0 =3D=3D 0 + +#define LOCK_SH 0x01 /* shared file lock */ +#define LOCK_EX 0x02 /* exclusive file lock */ +#define LOCK_NB 0x04 /* don't block when locking */ +#define LOCK_UN 0x08 /* unlock file */ + +extern int flock _PARAMS ((int, int)); + +#endif + #endif Thanks in advance, Corinna --=20 Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat --Gs9iBZf6UKWgztis Content-Type: application/pgp-signature Content-length: 819 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJS858oAAoJEPU2Bp2uRE+gNZQQAJSCkquPIUBFKzId0EQIM0tK OO9dPeOcj3P9UpovDhL+7FMUFE8AEo+HLXY98n2W7G+4pv3idwcVcS7F7WIG+fOx FkC4KCgxKJVeZljQNwk9sL6NAwb2cRz6nP63wph4YHxo+zD5yu2hObUqTIC+ffIZ hwb+r9rqlRrvSzJFEU1JQdyELs+ZjfX8BqaoPb7Mj3DTaAtt08gWtnNc9ZtLL47y JIPUPej1qE5ZGLMXEFloOPYkoJLSD26LT95Gv0nT3WvM3FpFBTXphjsPQcaGy1Iz MSj/s2BPabYf/q29PGS6kzt4AjbR2ybTD49OrhN8CFdlgQWHDUcJ7Z6svpOUEvWI 8VaGJPNtM77aXyDhLsSb50JSAB8yZw+MGr6vTFnFNKzrvLHg1SeeXvO2K8bLIQIP KzisuaKDM3WoGRNfClGPkfnpt5+EeYpKIWH+mNLQrXujdr6DbC/QEfqXQ7XAyYM2 ObIgDeY5BCTtIUZ/xaBboTQ9RBXPPT97l1nexAGsHd6tUMJVD/HzOZOJese40ht0 QsjD7+ilY9LssbijWPVwwzdUCB7DCohfna5rnqSDhI0gmHBPCJ4PkTdG/nUL8ZMn TyiigpiOrS8Mr6D2z7PFcBBFUCZHmr+Se23YHYyezxA5pn+MmWkt1CoHujrIMluK eWgV4ULzGAO0xXIsGNmI =sYp/ -----END PGP SIGNATURE----- --Gs9iBZf6UKWgztis--