summarylogtreecommitdiffstats
path: root/0003a-gcc-10-duplicate-variables-vc_mon-stk_mon.patch
blob: 6c557dc6d30fb26e5a63dea62ca72aefef583c71 (plain)
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
74
75
76
77
diff -pNarZu5 a/daemon/vcom_client.c b/daemon/vcom_client.c
--- a/daemon/vcom_client.c	2021-09-10 02:47:19.000000000 -0400
+++ b/daemon/vcom_client.c	2023-01-03 23:58:24.161930421 -0500
@@ -46,11 +46,12 @@ static vc_ssl_cfg m_sslcfg;
 #endif
 //#include "vcom_debug.h"
 
 #define RBUF_SIZE	4096
 
-extern void * stk_mon; 
+/*extern*/ void * stk_mon; 
+struct vc_monitor vc_mon;
 
 static int recv_second_chance(int sock, char * buf, int buflen)
 {
 	int ret;
 	struct timeval tv;
diff -pNarZu5 a/daemon/vcom.h b/daemon/vcom.h
--- a/daemon/vcom.h	2021-09-10 02:47:19.000000000 -0400
+++ b/daemon/vcom.h	2023-01-03 23:58:09.428532325 -0500
@@ -126,10 +126,11 @@ static inline struct vc_ops * stk_curnt(
 #define INO_PUSH_SWITCH 0
 #define INO_POP_SWITCH 0
 #define INO_RPLS_SWITCH 0
 #define INO_RESTART_SWITCH 0
 
+extern
 void * stk_mon;
 
 
 static inline int _stk_log(struct stk_vc *stk, char * __form, ...)
 {
diff -pNarZu5 a/daemon/vcom_monitor_dbg.h b/daemon/vcom_monitor_dbg.h
--- a/daemon/vcom_monitor_dbg.h	2021-09-10 02:47:19.000000000 -0400
+++ b/daemon/vcom_monitor_dbg.h	2023-01-03 23:58:09.428532325 -0500
@@ -31,10 +31,11 @@ struct vc_monitor{
 	int pid;
 	int max_statl;
 	int dbg_first;
 	char fname[FNAME_LEN];
 };
+extern
 struct vc_monitor vc_mon;
 
 static inline int mon_init(char * fname)
 {
 	vc_mon.fd = -1;
diff -pNarZu5 a/daemon/vcom_monitor.h b/daemon/vcom_monitor.h
--- a/daemon/vcom_monitor.h	2021-09-10 02:47:19.000000000 -0400
+++ b/daemon/vcom_monitor.h	2023-01-03 23:58:09.428532325 -0500
@@ -28,10 +28,11 @@ struct vc_monitor{
 	int fd;
 	int pid;
 	int msgl;
 	char fname[FNAME_LEN];
 };
+extern
 struct vc_monitor vc_mon;
 
 static inline int mon_init(char * fname)
 {
 	vc_mon.fd = -1;
diff -pNarZu5 a/daemon/vcom_monitor_pre_stat.h b/daemon/vcom_monitor_pre_stat.h
--- a/daemon/vcom_monitor_pre_stat.h	2021-09-10 02:47:19.000000000 -0400
+++ b/daemon/vcom_monitor_pre_stat.h	2023-01-03 23:58:09.428532325 -0500
@@ -28,10 +28,11 @@ struct vc_monitor{
 	int pid;
 	int msgl;
 	char pre_stat[16];
 	char fname[FNAME_LEN];
 };
+extern
 struct vc_monitor vc_mon;
 
 static inline int mon_init(char * fname)
 {
 	vc_mon.fd = -1;