r6413 - glibc-package/branches/glibc-2.21/debian/patches/hurd-i386
Author: sthibault
Date: 2015-03-21 03:57:21 +0000 (Sat, 21 Mar 2015)
New Revision: 6413
Modified:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff
Log:
fix patch
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff 2015-03-21 03:55:06 UTC (rev 6412)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff 2015-03-21 03:57:21 UTC (rev 6413)
@@ -3530,152 +3530,6 @@
+
+ return 0;
+}
-Index: glibc-2.21/libpthread/pthread/pthread-functions.h
-===================================================================
---- glibc-2.21.orig/libpthread/pthread/pthread-functions.h
-+++ /dev/null
-@@ -1,141 +0,0 @@
--/* Copyright (C) 2003, 2012 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#ifndef _PTHREAD_FUNCTIONS_H
--#define _PTHREAD_FUNCTIONS_H 1
--
--#include <pthread.h>
--
--int __pthread_attr_destroy (pthread_attr_t *);
--int __pthread_attr_init (pthread_attr_t *);
--int __pthread_attr_getdetachstate (const pthread_attr_t *, int *);
--int __pthread_attr_setdetachstate (pthread_attr_t *, int);
--int __pthread_attr_getinheritsched (const pthread_attr_t *, int *);
--int __pthread_attr_setinheritsched (pthread_attr_t *, int);
--int __pthread_attr_getschedparam (const pthread_attr_t *,
-- struct sched_param *);
--int __pthread_attr_setschedparam (pthread_attr_t *,
-- const struct sched_param *);
--int __pthread_attr_getschedpolicy (const pthread_attr_t *, int *);
--int __pthread_attr_setschedpolicy (pthread_attr_t *, int);
--int __pthread_attr_getscope (const pthread_attr_t *, int *);
--int __pthread_attr_setscope (pthread_attr_t *, int);
--int __pthread_condattr_destroy (pthread_condattr_t *);
--int __pthread_condattr_init (pthread_condattr_t *);
--int __pthread_cond_broadcast (pthread_cond_t *);
--int __pthread_cond_destroy (pthread_cond_t *);
--int __pthread_cond_init (pthread_cond_t *,
-- const pthread_condattr_t *);
--int __pthread_cond_signal (pthread_cond_t *);
--int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
--int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
-- const struct timespec *);
--int __pthread_equal (pthread_t, pthread_t);
--void __pthread_exit (void *);
--int __pthread_getschedparam (pthread_t, int *, struct sched_param *);
--int __pthread_setschedparam (pthread_t, int,
-- const struct sched_param *);
--int _pthread_mutex_destroy (pthread_mutex_t *);
--int _pthread_mutex_init (pthread_mutex_t *,
-- const pthread_mutexattr_t *);
--int __pthread_mutex_lock (pthread_mutex_t *);
--int __pthread_mutex_trylock (pthread_mutex_t *);
--int __pthread_mutex_unlock (pthread_mutex_t *);
--pthread_t __pthread_self (void);
--int __pthread_setcancelstate (int, int *);
--int __pthread_setcanceltype (int, int *);
--struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
--int __pthread_once (pthread_once_t *, void (*) (void));
--int __pthread_rwlock_rdlock (pthread_rwlock_t *);
--int __pthread_rwlock_wrlock (pthread_rwlock_t *);
--int __pthread_rwlock_unlock (pthread_rwlock_t *);
--int __pthread_key_create (pthread_key_t *, void (*) (void *));
--void *__pthread_getspecific (pthread_key_t);
--int __pthread_setspecific (pthread_key_t, const void *);
--
--void _cthreads_flockfile (FILE *);
--void _cthreads_funlockfile (FILE *);
--int _cthreads_ftrylockfile (FILE *);
--
--/* Data type shared with libc. The libc uses it to pass on calls to
-- the thread functions. Wine pokes directly into this structure,
-- so if possible avoid breaking it and append new hooks to the end. */
--struct pthread_functions
--{
-- int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
-- int (*ptr_pthread_attr_init) (pthread_attr_t *);
-- int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *);
-- int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int);
-- int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *);
-- int (*ptr_pthread_attr_setinheritsched) (pthread_attr_t *, int);
-- int (*ptr_pthread_attr_getschedparam) (const pthread_attr_t *,
-- struct sched_param *);
-- int (*ptr_pthread_attr_setschedparam) (pthread_attr_t *,
-- const struct sched_param *);
-- int (*ptr_pthread_attr_getschedpolicy) (const pthread_attr_t *, int *);
-- int (*ptr_pthread_attr_setschedpolicy) (pthread_attr_t *, int);
-- int (*ptr_pthread_attr_getscope) (const pthread_attr_t *, int *);
-- int (*ptr_pthread_attr_setscope) (pthread_attr_t *, int);
-- int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
-- int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
-- int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
-- int (*ptr_pthread_cond_destroy) (pthread_cond_t *);
-- int (*ptr_pthread_cond_init) (pthread_cond_t *,
-- const pthread_condattr_t *);
-- int (*ptr_pthread_cond_signal) (pthread_cond_t *);
-- int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
-- int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
-- const struct timespec *);
-- int (*ptr_pthread_equal) (pthread_t, pthread_t);
-- void (*ptr_pthread_exit) (void *);
-- int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
-- int (*ptr_pthread_setschedparam) (pthread_t, int,
-- const struct sched_param *);
-- int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
-- int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
-- const pthread_mutexattr_t *);
-- int (*ptr_pthread_mutex_lock) (pthread_mutex_t *);
-- int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *);
-- int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
-- pthread_t (*ptr_pthread_self) (void);
-- int (*ptr_pthread_setcancelstate) (int, int *);
-- int (*ptr_pthread_setcanceltype) (int, int *);
-- struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
-- int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
-- int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *);
-- int (*ptr_pthread_rwlock_wrlock) (pthread_rwlock_t *);
-- int (*ptr_pthread_rwlock_unlock) (pthread_rwlock_t *);
-- int (*ptr_pthread_key_create) (pthread_key_t *, void (*) (void *));
-- void *(*ptr_pthread_getspecific) (pthread_key_t);
-- int (*ptr_pthread_setspecific) (pthread_key_t, const void *);
-- void (*ptr__IO_flockfile) (FILE *);
-- void (*ptr__IO_funlockfile) (FILE *);
-- int (*ptr__IO_ftrylockfile) (FILE *);
--};
--
--/* Variable in libc.so. */
--extern struct pthread_functions __libc_pthread_functions attribute_hidden;
--extern int __libc_pthread_functions_init attribute_hidden;
--
--void __libc_pthread_init (const struct pthread_functions *functions);
--
--# define PTHFCT_CALL(fct, params) \
-- __libc_pthread_functions.fct params
--
--#endif /* pthread-functions.h */
Index: glibc-2.21/libpthread/pthread/pt-initialize.c
===================================================================
--- /dev/null
Reply to: