[patch] Supporting gcc10 patch on top of upstream-latest

gcc10.patch (text/plain), 2.13 KB, created by Malcolm Lashley on 2020-05-16 13:25:07 UTC

--- ddccontrol-0.4.4_p20181007/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/notebook.h	2018-10-07 07:45:14.000000000 +0100
+++ ddccontrol-0.4.4_p20181007_patched/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/notebook.h	2020-05-16 14:12:49.946923621 +0100
@@ -43,12 +43,12 @@
 #endif
 
 /* globals */
-struct monitor* mon;
+extern struct monitor* mon;
 
-GtkWidget* main_app_window;
+extern GtkWidget* main_app_window;
 
-GtkWidget* monitor_manager;
-GtkWidget* profile_manager;
+extern GtkWidget* monitor_manager;
+extern GtkWidget* profile_manager;
 
 /* notebook.c */
 
@@ -91,13 +91,13 @@
 
 GtkWidget *stock_label_button(const gchar * stockid, const gchar *label_text, const gchar *tool_tip);
 
-GtkWidget* profile_manager_button;
-GtkWidget* saveprofile_button;
-GtkWidget* cancelprofile_button;
-GtkWidget* refresh_controls_button;
+extern GtkWidget* profile_manager_button;
+extern GtkWidget* saveprofile_button;
+extern GtkWidget* cancelprofile_button;
+extern GtkWidget* refresh_controls_button;
 
 /* Multimonitor support */
-int current_monitor; /* current monitor */
-int num_monitor; /* total number of monitors */
+extern int current_monitor; /* current monitor */
+extern int num_monitor; /* total number of monitors */
 
 #endif //NOTEBOOK_H
--- ddccontrol-0.4.4_p20181007/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/main.c	2018-10-07 07:45:14.000000000 +0100
+++ ddccontrol-0.4.4_p20181007_patched/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/main.c	2020-05-16 14:14:29.361990072 +0100
@@ -31,6 +31,24 @@
 
 #include "daemon/dbus_client.h"
 
+/* Globals previously in notebook.h */
+
+struct monitor* mon;
+GtkWidget* main_app_window;
+GtkWidget* monitor_manager;
+GtkWidget* profile_manager;
+GtkWidget* profile_manager_button;
+GtkWidget* saveprofile_button;
+GtkWidget* cancelprofile_button;
+GtkWidget* refresh_controls_button;
+
+/* Multimonitor support */
+int current_monitor; /* current monitor */
+int num_monitor; /* total number of monitors */
+
+/* End Globals moved for -fno-common/gcc10 fix */
+
+
 GtkWidget* table;
 
 GtkWidget *combo_box;