From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23047 invoked by alias); 21 Oct 2002 09:27:39 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 23031 invoked from network); 21 Oct 2002 09:27:37 -0000 Received: from unknown (HELO Cantor.suse.de) (213.95.15.193) by sources.redhat.com with SMTP; 21 Oct 2002 09:27:37 -0000 Received: from Hermes.suse.de (Charybdis.suse.de [213.95.15.201]) by Cantor.suse.de (Postfix) with ESMTP id DC54314577; Mon, 21 Oct 2002 11:27:36 +0200 (MEST) Date: Tue, 22 Oct 2002 06:51:00 -0000 From: Thorsten Kukuk To: libc-hacker@sources.redhat.com Cc: drepper@redhat.com Subject: bits/libc-lock.h and _LIBC Message-ID: <20021021112734.A25309@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.22.1i Organization: SuSE Linux AG, Nuernberg, Germany X-SW-Source: 2002-10/txt/msg00077.txt.bz2 Hi, We install libc-lock.h into /usr/include/bits. But libc-lock.h is only useable, if it is compiled with -D_LIBC, which breaks now with libio.h. I suggest the following patch, or is there any reason for the ifdef _LIBC around __libc_lock_t ? We don't do this for __libc_key_t and all the other definitions. 2002-10-17 Thorsten Kukuk * sysdeps/pthread/bits/libc-lock.h: Don't protect __libc_lock_t with _LIBC. diff -u -r1.23 libc-lock.h --- ./linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ ./linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -24,19 +24,9 @@ #include /* Mutex type. */ -#if defined(_LIBC) || defined(_IO_MTSAFE_IO) typedef pthread_mutex_t __libc_lock_t; typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; -# ifdef __USE_UNIX98 typedef pthread_rwlock_t __libc_rwlock_t; -# else -typedef struct __libc_rwlock_opaque__ __libc_rwlock_t; -# endif -#else -typedef struct __libc_lock_opaque__ __libc_lock_t; -typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; -typedef struct __libc_rwlock_opaque__ __libc_rwlock_t; -#endif /* Type for key to thread-specific data. */ typedef pthread_key_t __libc_key_t; -- Thorsten Kukuk http://www.suse.de/~kukuk/ kukuk@suse.de SuSE Linux AG Deutschherrnstr. 15-19 D-90429 Nuernberg -------------------------------------------------------------------- Key fingerprint = A368 676B 5E1B 3E46 CFCE 2D97 F8FD 4E23 56C6 FB4B