mirror of
https://github.com/openwrt/packages.git
synced 2025-02-14 14:58:03 +00:00
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 1 Mar 2023 22:58:37 -0800
|
|
Subject: [PATCH] Match prototypes of callbacks with libgphoto
|
|
|
|
In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
|
|
we tried to fix by using pthread_t but it also needs to make changes in
|
|
libgphoto and these changes can be invasive, therefore lets revert to
|
|
older types and to fix musl problem fix it via type casts
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
gphoto2/main.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/gphoto2/main.c
|
|
+++ b/gphoto2/main.c
|
|
@@ -1198,7 +1198,7 @@ thread_func (void *data)
|
|
pthread_cleanup_pop (1);
|
|
}
|
|
|
|
-static pthread_t
|
|
+static unsigned int
|
|
start_timeout_func (Camera *camera, unsigned int timeout,
|
|
CameraTimeoutFunc func, void __unused__ *data)
|
|
{
|
|
@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsi
|
|
|
|
pthread_create (&tid, NULL, thread_func, td);
|
|
|
|
- return (tid);
|
|
+ return (unsigned int)tid;
|
|
}
|
|
|
|
static void
|
|
-stop_timeout_func (Camera __unused__ *camera, pthread_t id,
|
|
+stop_timeout_func (Camera __unused__ *camera, unsigned int id,
|
|
void __unused__ *data)
|
|
{
|
|
- pthread_t tid = id;
|
|
+ pthread_t tid = (pthread_t)id;
|
|
|
|
pthread_cancel (tid);
|
|
pthread_join (tid, NULL);
|