1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
Description: Fix linking errors with multiply defined symbols
Multiple header files define the same variable, which is nowhere actually used.
Author: IOhannes m zmölnig
Origin: Debian
Forwarded: https://github.com/unicap/unicap/pull/6
Last-Update: 2020-07-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- unicap.orig/common/queue.h
+++ unicap/common/queue.h
@@ -24,16 +24,14 @@
#include <sys/time.h>
#include <semaphore.h>
-struct _unicap_queue
+typedef struct _unicap_queue
{
sem_t sema;
sem_t *psema;
void * data;
struct _unicap_queue *next;
-} unicap_queue;
-
-typedef struct _unicap_queue unicap_queue_t;
+} unicap_queue_t;
__HIDDEN__ void ucutil_insert_back_queue( unicap_queue_t *queue, unicap_queue_t *entry );
__HIDDEN__ void ucutil_insert_front_queue( unicap_queue_t *queue, unicap_queue_t *entry );
--- unicap.orig/cpi/aravis/queue.h
+++ unicap/cpi/aravis/queue.h
@@ -24,7 +24,7 @@
#include <sys/time.h>
#include <semaphore.h>
-struct _unicap_queue
+typedef struct _unicap_queue
{
sem_t sema;
sem_t *psema;
@@ -34,9 +34,7 @@
void * data;
struct _unicap_queue *next;
-} unicap_queue;
-
-typedef struct _unicap_queue unicap_queue_t;
+} unicap_queue_t;
void _init_queue( struct _unicap_queue *queue );
void _destroy_queue( struct _unicap_queue *queue );
--- unicap.orig/cpi/euvccam/queue.h
+++ unicap/cpi/euvccam/queue.h
@@ -24,7 +24,7 @@
#include <sys/time.h>
#include <semaphore.h>
-struct _unicap_queue
+typedef struct _unicap_queue
{
sem_t sema;
sem_t *psema;
@@ -34,9 +34,7 @@
void * data;
struct _unicap_queue *next;
-} unicap_queue;
-
-typedef struct _unicap_queue unicap_queue_t;
+} unicap_queue_t;
void _init_queue( struct _unicap_queue *queue );
void _destroy_queue( struct _unicap_queue *queue );
|
