]>
Commit | Line | Data |
---|---|---|
5f48d816 JB |
1 | --- libvirt-php-0.5.5/src/libvirt-connection.h.orig 2019-12-30 07:03:57.000000000 +0100 |
2 | +++ libvirt-php-0.5.5/src/libvirt-connection.h 2020-10-06 17:26:49.496920124 +0200 | |
3 | @@ -46,7 +46,7 @@ | |
4 | RETURN_FALSE; \ | |
5 | } while (0) | |
6 | ||
7 | -int le_libvirt_connection; | |
8 | +extern int le_libvirt_connection; | |
9 | ||
10 | typedef struct _php_libvirt_connection { | |
11 | virConnectPtr conn; | |
12 | --- libvirt-php-0.5.5/src/libvirt-connection.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
13 | +++ libvirt-php-0.5.5/src/libvirt-connection.c 2020-10-06 17:51:56.241895065 +0200 | |
14 | @@ -11,6 +11,8 @@ | |
15 | ||
16 | DEBUG_INIT("connection"); | |
17 | ||
18 | +int le_libvirt_connection; | |
19 | + | |
20 | /* | |
21 | * Private function name: free_resources_on_connection | |
22 | * Since version: 0.4.2 | |
23 | --- libvirt-php-0.5.5/src/libvirt-domain.h.orig 2020-02-07 10:28:53.000000000 +0100 | |
24 | +++ libvirt-php-0.5.5/src/libvirt-domain.h 2020-10-06 17:27:17.735054051 +0200 | |
25 | @@ -120,7 +120,7 @@ | |
26 | PHP_FE(libvirt_list_active_domains, arginfo_libvirt_conn) \ | |
27 | PHP_FE(libvirt_list_inactive_domains, arginfo_libvirt_conn) | |
28 | ||
29 | -int le_libvirt_domain; | |
30 | +extern int le_libvirt_domain; | |
31 | ||
32 | typedef struct _php_libvirt_domain { | |
33 | virDomainPtr domain; | |
34 | --- libvirt-php-0.5.5/src/libvirt-domain.c.orig 2020-02-07 10:28:53.000000000 +0100 | |
35 | +++ libvirt-php-0.5.5/src/libvirt-domain.c 2020-10-06 17:52:15.516230584 +0200 | |
36 | @@ -15,6 +15,8 @@ | |
37 | ||
38 | DEBUG_INIT("domain"); | |
39 | ||
40 | +int le_libvirt_domain; | |
41 | + | |
42 | void | |
43 | php_libvirt_domain_dtor(virt_resource *rsrc TSRMLS_DC) | |
44 | { | |
45 | --- libvirt-php-0.5.5/src/libvirt-network.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
46 | +++ libvirt-php-0.5.5/src/libvirt-network.h 2020-10-06 17:27:35.602649121 +0200 | |
47 | @@ -45,7 +45,7 @@ | |
48 | PHP_FE(libvirt_list_all_networks, arginfo_libvirt_conn_optflags) \ | |
49 | PHP_FE(libvirt_list_networks, arginfo_libvirt_conn_optflags) | |
50 | ||
51 | -int le_libvirt_network; | |
52 | +extern int le_libvirt_network; | |
53 | ||
54 | typedef struct _php_libvirt_network { | |
55 | virNetworkPtr network; | |
56 | --- libvirt-php-0.5.5/src/libvirt-network.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
57 | +++ libvirt-php-0.5.5/src/libvirt-network.c 2020-10-06 17:52:32.913801854 +0200 | |
58 | @@ -11,6 +11,8 @@ | |
59 | ||
60 | DEBUG_INIT("network"); | |
61 | ||
62 | +int le_libvirt_network; | |
63 | + | |
64 | void | |
65 | php_libvirt_network_dtor(virt_resource *rsrc TSRMLS_DC) | |
66 | { | |
67 | --- libvirt-php-0.5.5/src/libvirt-nodedev.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
68 | +++ libvirt-php-0.5.5/src/libvirt-nodedev.h 2020-10-06 17:27:58.963862975 +0200 | |
69 | @@ -35,7 +35,7 @@ | |
70 | RETURN_FALSE; \ | |
71 | } while (0) | |
72 | ||
73 | -int le_libvirt_nodedev; | |
74 | +extern int le_libvirt_nodedev; | |
75 | ||
76 | typedef struct _php_libvirt_nodedev { | |
77 | virNodeDevicePtr device; | |
78 | --- libvirt-php-0.5.5/src/libvirt-nodedev.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
79 | +++ libvirt-php-0.5.5/src/libvirt-nodedev.c 2020-10-06 17:53:03.965416410 +0200 | |
80 | @@ -11,6 +11,8 @@ | |
81 | ||
82 | DEBUG_INIT("nodedev"); | |
83 | ||
84 | +int le_libvirt_nodedev; | |
85 | + | |
86 | void | |
87 | php_libvirt_nodedev_dtor(virt_resource *rsrc TSRMLS_DC) | |
88 | { | |
89 | --- libvirt-php-0.5.5/src/libvirt-nwfilter.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
90 | +++ libvirt-php-0.5.5/src/libvirt-nwfilter.h 2020-10-06 17:28:10.961153024 +0200 | |
91 | @@ -42,7 +42,7 @@ | |
92 | RETURN_FALSE; \ | |
93 | } while (0) \ | |
94 | ||
95 | -int le_libvirt_nwfilter; | |
96 | +extern int le_libvirt_nwfilter; | |
97 | ||
98 | typedef struct _php_libvirt_nwfilter { | |
99 | virNWFilterPtr nwfilter; | |
100 | --- libvirt-php-0.5.5/src/libvirt-nwfilter.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
101 | +++ libvirt-php-0.5.5/src/libvirt-nwfilter.c 2020-10-06 17:53:18.179488816 +0200 | |
102 | @@ -11,6 +11,8 @@ | |
103 | ||
104 | DEBUG_INIT("nwfilter"); | |
105 | ||
106 | +int le_libvirt_nwfilter; | |
107 | + | |
108 | void | |
109 | php_libvirt_nwfilter_dtor(virt_resource *rsrc TSRMLS_DC) | |
110 | { | |
111 | --- libvirt-php-0.5.5/src/libvirt-snapshot.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
112 | +++ libvirt-php-0.5.5/src/libvirt-snapshot.h 2020-10-06 17:28:28.618737181 +0200 | |
113 | @@ -38,7 +38,7 @@ | |
114 | RETURN_FALSE; \ | |
115 | } while (0) \ | |
116 | ||
117 | -int le_libvirt_snapshot; | |
118 | +extern int le_libvirt_snapshot; | |
119 | ||
120 | typedef struct _php_libvirt_snapshot { | |
121 | virDomainSnapshotPtr snapshot; | |
122 | --- libvirt-php-0.5.5/src/libvirt-snapshot.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
123 | +++ libvirt-php-0.5.5/src/libvirt-snapshot.c 2020-10-06 17:53:35.153704739 +0200 | |
124 | @@ -11,6 +11,8 @@ | |
125 | ||
126 | DEBUG_INIT("snapshot"); | |
127 | ||
128 | +int le_libvirt_snapshot; | |
129 | + | |
130 | void php_libvirt_snapshot_dtor(virt_resource *rsrc TSRMLS_DC) | |
131 | { | |
132 | php_libvirt_snapshot *snapshot = (php_libvirt_snapshot *)rsrc->ptr; | |
133 | --- libvirt-php-0.5.5/src/libvirt-storage.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
134 | +++ libvirt-php-0.5.5/src/libvirt-storage.h 2020-10-06 17:28:47.059695378 +0200 | |
135 | @@ -83,8 +83,8 @@ | |
136 | RETURN_FALSE; \ | |
137 | } while (0) \ | |
138 | ||
139 | -int le_libvirt_storagepool; | |
140 | -int le_libvirt_volume; | |
141 | +extern int le_libvirt_storagepool; | |
142 | +extern int le_libvirt_volume; | |
143 | ||
144 | typedef struct _php_libvirt_storagepool { | |
145 | virStoragePoolPtr pool; | |
146 | --- libvirt-php-0.5.5/src/libvirt-storage.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
147 | +++ libvirt-php-0.5.5/src/libvirt-storage.c 2020-10-06 17:53:56.554817509 +0200 | |
148 | @@ -12,6 +12,9 @@ | |
149 | ||
150 | DEBUG_INIT("storage"); | |
151 | ||
152 | +int le_libvirt_storagepool; | |
153 | +int le_libvirt_volume; | |
154 | + | |
155 | void | |
156 | php_libvirt_storagepool_dtor(virt_resource *rsrc TSRMLS_DC) | |
157 | { | |
158 | --- libvirt-php-0.5.5/src/libvirt-stream.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
159 | +++ libvirt-php-0.5.5/src/libvirt-stream.h 2020-10-06 17:23:35.320150821 +0200 | |
160 | @@ -20,7 +20,7 @@ | |
161 | PHP_FE(libvirt_stream_send, arginfo_libvirt_stream_send) \ | |
162 | PHP_FE(libvirt_stream_recv, arginfo_libvirt_stream_recv) | |
163 | ||
164 | -int le_libvirt_stream; | |
165 | +extern int le_libvirt_stream; | |
166 | ||
167 | typedef struct _php_libvirt_stream { | |
168 | virStreamPtr stream; | |
169 | --- libvirt-php-0.5.5/src/libvirt-stream.c.orig 2019-12-30 07:03:57.000000000 +0100 | |
170 | +++ libvirt-php-0.5.5/src/libvirt-stream.c 2020-10-06 17:54:37.943636225 +0200 | |
171 | @@ -11,6 +11,8 @@ | |
172 | ||
173 | DEBUG_INIT("stream"); | |
174 | ||
175 | +int le_libvirt_stream; | |
176 | + | |
177 | void | |
178 | php_libvirt_stream_dtor(virt_resource *rsrc TSRMLS_DC) | |
179 | { | |
180 | --- libvirt-php-0.5.5/src/libvirt-php.h.orig 2019-12-30 07:03:57.000000000 +0100 | |
181 | +++ libvirt-php-0.5.5/src/libvirt-php.h 2020-10-06 17:31:43.808879304 +0200 | |
182 | @@ -155,7 +155,7 @@ | |
183 | int binding_resources_count; | |
184 | ZEND_END_MODULE_GLOBALS(libvirt) | |
185 | ||
186 | -ZEND_DECLARE_MODULE_GLOBALS(libvirt) | |
187 | +ZEND_EXTERN_MODULE_GLOBALS(libvirt) | |
188 | ||
189 | /* Private definitions */ | |
190 | void set_error(char *msg TSRMLS_DC); | |
191 | --- libvirt-php-0.5.5/src/libvirt-php.c.orig 2020-01-17 07:41:48.000000000 +0100 | |
192 | +++ libvirt-php-0.5.5/src/libvirt-php.c 2020-10-06 17:50:18.836830402 +0200 | |
193 | @@ -40,6 +40,8 @@ | |
194 | const char *features_binaries[] = { NULL }; | |
195 | #endif | |
196 | ||
197 | +ZEND_DECLARE_MODULE_GLOBALS(libvirt) | |
198 | + | |
199 | ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_connect, 0, 0, 0) | |
200 | ZEND_ARG_INFO(0, url) | |
201 | ZEND_ARG_INFO(0, readonly) |