mirror of
https://github.com/openwrt/packages.git
synced 2025-02-12 04:38:06 +00:00
2a139f844c
Upstream backports. Signed-off-by: Rosen Penev <rosenp@gmail.com>
34 lines
972 B
Diff
34 lines
972 B
Diff
From ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 2 Sep 2022 12:59:46 -0700
|
|
Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
|
|
|
|
This is not a plain old datatype in every libc, e.g. with musl this
|
|
would fail in type conversion
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
gphoto2/main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/gphoto2/main.c
|
|
+++ b/gphoto2/main.c
|
|
@@ -1198,7 +1198,7 @@ thread_func (void *data)
|
|
pthread_cleanup_pop (1);
|
|
}
|
|
|
|
-static unsigned int
|
|
+static pthread_t
|
|
start_timeout_func (Camera *camera, unsigned int timeout,
|
|
CameraTimeoutFunc func, void __unused__ *data)
|
|
{
|
|
@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsi
|
|
}
|
|
|
|
static void
|
|
-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
|
|
+stop_timeout_func (Camera __unused__ *camera, pthread_t id,
|
|
void __unused__ *data)
|
|
{
|
|
pthread_t tid = id;
|