blob: 30897caab36ff82b64dc80145c90fb28b1f81a6e [file] [log] [blame]
Patrick Williamsac13d5f2023-11-24 18:59:46 -06001Fix build on 32bit architectures
2
3It fails with errors like
4| ../../xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc:126:13: error: no matching function for call to 'read_netload_libgtop'
5| 126 | if (read_netload_libgtop (&bytes[1]) != 0)
6| | ^~~~~~~~~~~~~~~~~~~~
7| ../../xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc:42:1: note: candidate function not viable: no known conversion from 'guint64 *' (aka 'unsigned long long *') to 'gulong *' (aka 'unsigne
8d long *') for 1st argument
9| 42 | read_netload_libgtop (gulong *bytes)
10| | ^ ~~~~~~~~~~~~~
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15--- a/panel-plugin/network.cc
16+++ b/panel-plugin/network.cc
17@@ -114,6 +114,7 @@ read_netload_proc (gulong *bytes)
18 gint
19 read_netload (gulong *net, gulong *NTotal)
20 {
21+ gulong tbytes[2];
22 static guint64 bytes[2];
23 static gint64 time[2];
24
25@@ -122,10 +123,12 @@ read_netload (gulong *net, gulong *NTota
26
27 time[1] = g_get_monotonic_time ();
28
29- if (read_netload_proc (&bytes[1]) != 0)
30- if (read_netload_libgtop (&bytes[1]) != 0)
31+ if (read_netload_proc (&tbytes[1]) != 0)
32+ if (read_netload_libgtop (&tbytes[1]) != 0)
33 return -1;
34
35+ bytes[0] = tbytes[0];
36+ bytes[1] = tbytes[1];
37 if (time[0] != 0 && G_LIKELY (time[1] > time[0]) && G_LIKELY (bytes[1] >= bytes[0]))
38 {
39 guint64 diff_bits = 8 * (bytes[1] - bytes[0]);