summaryrefslogtreecommitdiff
path: root/debian/patches/libpthread_setcancel.patch
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-01 12:43:52 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-01 12:45:12 +0200
commit2785afe572b463d578e023c6d4668aae888e09a5 (patch)
tree995dfb2f576d9c40d59d422f48127e25f1ef2cd3 /debian/patches/libpthread_setcancel.patch
parent9de2a32ced4076497e26ebfcffbd8c3ec260699b (diff)
New upstream 20100701 snapshot.
- debian/patches/dir_acces_fix.patch: Remove patch, merged upstream. - debian/patches/exec_fix.patch: Likewise. - debian/patches/libdiskfs-rename.patch: Likewise. - debian/patches/libpthread_mutex_owner.patch: Likewise. - debian/patches/libpthread_recursive_mutex_initializer.patch: Likewise. - debian/patches/libpthread_setcancel.patch: Likewise. - debian/patches/pfinet-gcc-4.3-fix.patch: Likewise. - debian/patches/procfs.patch: Likewise. - debian/patches/libpthread_cancel_init.patch: Likewise - debian/patches/libpthread_kill_0.patch: Likewise - debian/patches/console_current_vcs.patch: Likewise - debian/patches/hurd_console_startup.patch: Likewise - debian/patches/MAKEDEV.patch: Likewise - debian/patches/tmpfs.patch: Likewise - debian/patches/libpthread_procfs.patch: New patch, to enable libpthread and procfs build.
Diffstat (limited to 'debian/patches/libpthread_setcancel.patch')
-rw-r--r--debian/patches/libpthread_setcancel.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/libpthread_setcancel.patch b/debian/patches/libpthread_setcancel.patch
deleted file mode 100644
index 601a698f..00000000
--- a/debian/patches/libpthread_setcancel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
----
- libpthread/pthread/pt-setcancelstate.c | 3 ++-
- libpthread/pthread/pt-setcanceltype.c | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
---- a/libpthread/pthread/pt-setcancelstate.c
-+++ b/libpthread/pthread/pt-setcancelstate.c
-@@ -35,7 +35,8 @@ pthread_setcancelstate (int state, int *
- break;
- }
-
-- *oldstate = p->cancel_state;
-+ if (oldstate)
-+ *oldstate = p->cancel_state;
- p->cancel_state = state;
-
- return 0;
---- a/libpthread/pthread/pt-setcanceltype.c
-+++ b/libpthread/pthread/pt-setcanceltype.c
-@@ -35,7 +35,8 @@ pthread_setcanceltype (int type, int *ol
- break;
- }
-
-- *oldtype = p->cancel_type;
-+ if (oldtype)
-+ *oldtype = p->cancel_type;
- p->cancel_type = type;
-
- return 0;