Skip to content
Snippets Groups Projects
Commit c0ed05a5 authored by Samuel Thibault's avatar Samuel Thibault
Browse files

Fix applying patch without fuzz

parent 4d022eff
No related branches found
No related tags found
No related merge requests found
Pipeline #832842 passed
......@@ -6,8 +6,12 @@ Date: Sat Mar 15 15:23:42 2025 +0000
as expected by tst-cancel32.
diff --git a/htl/pt-setcancelstate.c b/htl/pt-setcancelstate.c
index 6e09c260ea..0d5692e661 100644
---
htl/pt-setcancelstate.c | 8 ++++++++
htl/pt-setcanceltype.c | 5 +++++
sysdeps/htl/pthreadP.h | 8 ++++++++
3 files changed, 21 insertions(+)
--- a/htl/pt-setcancelstate.c
+++ b/htl/pt-setcancelstate.c
@@ -24,6 +24,7 @@ int
......@@ -18,7 +22,7 @@ index 6e09c260ea..0d5692e661 100644
switch (state)
{
@@ -38,8 +39,15 @@ __pthread_setcancelstate (int state, int *oldstate)
@@ -38,8 +39,15 @@ __pthread_setcancelstate (int state, int
if (oldstate != NULL)
*oldstate = p->cancel_state;
p->cancel_state = state;
......@@ -33,9 +37,7 @@ index 6e09c260ea..0d5692e661 100644
+
return 0;
}
libc_hidden_def (__pthread_setcancelstate)
diff --git a/htl/pt-setcanceltype.c b/htl/pt-setcanceltype.c
index 0b76fbfbd6..b33931c468 100644
--- a/htl/pt-setcanceltype.c
+++ b/htl/pt-setcanceltype.c
@@ -24,6 +24,7 @@ int
......@@ -46,7 +48,7 @@ index 0b76fbfbd6..b33931c468 100644
switch (type)
{
@@ -38,8 +39,12 @@ __pthread_setcanceltype (int type, int *oldtype)
@@ -38,8 +39,12 @@ __pthread_setcanceltype (int type, int *
if (oldtype != NULL)
*oldtype = p->cancel_type;
p->cancel_type = type;
......@@ -58,12 +60,10 @@ index 0b76fbfbd6..b33931c468 100644
+
return 0;
}
libc_hidden_def (__pthread_setcanceltype)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 9479b9ef24..78ef4e7674 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -221,6 +221,14 @@ hidden_proto (__pthread_setspecific)
@@ -172,6 +172,14 @@ hidden_proto (__pthread_mutex_timedlock)
hidden_proto (__pthread_get_cleanup_stack)
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment