From f58c435e4e4f5030af44d2cde8042bcf10d24615 Mon Sep 17 00:00:00 2001
From: Michal Fabik <mfabik@redhat.com>
Date: Tue, 28 Jan 2020 13:45:14 +0100
Subject: [PATCH] Fix build failure with gcc -fno-common

Signed-off-by: Michal Fabik <mfabik@redhat.com>
---
 src/configuration-gui/abrt-config-widget.c | 2 +-
 src/dbus/abrt_problems2_service.c          | 4 ++--
 src/dbus/abrt_problems2_service.h          | 8 ++++----
 src/dbus/abrt_problems2_session.c          | 2 +-
 src/dbus/abrt_problems2_task.c             | 2 +-
 src/plugins/oops-utils.c                   | 2 ++
 src/plugins/oops-utils.h                   | 2 +-
 src/plugins/xorg-utils.c                   | 2 ++
 src/plugins/xorg-utils.h                   | 2 +-
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c
index aa3b5c01b..518ecd1d0 100644
--- a/src/configuration-gui/abrt-config-widget.c
+++ b/src/configuration-gui/abrt-config-widget.c
@@ -109,7 +109,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX)
 enum {
     SN_CHANGED,
     SN_LAST_SIGNAL
-} SignalNumber;
+};
 
 static guint s_signals[SN_LAST_SIGNAL] = { 0 };
 
diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c
index a0d2a3ce6..a1e7ae322 100644
--- a/src/dbus/abrt_problems2_service.c
+++ b/src/dbus/abrt_problems2_service.c
@@ -1589,7 +1589,7 @@ AbrtP2Object *abrt_p2_service_get_entry_object(AbrtP2Service *service,
 
 AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service,
             const char *problem_id,
-            int flags,
+            AbrtP2ServiceEntryLookupFlags flags,
             GError **error)
 {
     char *entry_path = entry_object_dir_name_to_path(problem_id);
@@ -2062,7 +2062,7 @@ GVariant *abrt_p2_service_callers_session(AbrtP2Service *service,
 
 GVariant *abrt_p2_service_get_problems(AbrtP2Service *service,
                 uid_t caller_uid,
-                gint32 flags,
+                AbrtP2ServiceGetProblemsFlags flags,
                 GVariant *options,
                 GError **error)
 {
diff --git a/src/dbus/abrt_problems2_service.h b/src/dbus/abrt_problems2_service.h
index f82cf503a..22b97a6e8 100644
--- a/src/dbus/abrt_problems2_service.h
+++ b/src/dbus/abrt_problems2_service.h
@@ -86,14 +86,14 @@ GVariant *abrt_p2_service_entry_problem_data(AbrtP2Service *service,
             GError **error);
 
 
-enum {
+typedef enum {
     ABRT_P2_SERVICE_ENTRY_LOOKUP_NOFLAGS  = 0x0, ///< return with error if not found
     ABRT_P2_SERVICE_ENTRY_LOOKUP_OPTIONAL = 0x1, ///< return NULL if not found
-} AbrtP2ServiceEntryLookupFlag;
+} AbrtP2ServiceEntryLookupFlags;
 
 AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service,
             const char *problem_id,
-            int flags,
+            AbrtP2ServiceEntryLookupFlags flags,
             GError **error);
 
 struct _AbrtP2Entry;
@@ -145,7 +145,7 @@ typedef enum
 
 GVariant *abrt_p2_service_get_problems(AbrtP2Service *service,
             uid_t caller_uid,
-            gint32 flags,
+            AbrtP2ServiceGetProblemsFlags flags,
             GVariant *options,
             GError **error);
 
diff --git a/src/dbus/abrt_problems2_session.c b/src/dbus/abrt_problems2_session.c
index 96db4ccc5..85ee78887 100644
--- a/src/dbus/abrt_problems2_session.c
+++ b/src/dbus/abrt_problems2_session.c
@@ -97,7 +97,7 @@ struct check_auth_cb_params
 enum {
     SN_AUTHORIZATION_CHANGED,
     SN_LAST_SIGNAL
-} SignalNumber;
+};
 
 static guint s_signals[SN_LAST_SIGNAL] = { 0 };
 
diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c
index cba6b469a..e6ae171c7 100644
--- a/src/dbus/abrt_problems2_task.c
+++ b/src/dbus/abrt_problems2_task.c
@@ -21,7 +21,7 @@
 enum {
     SN_STATUS_CHANGED,
     SN_LAST_SIGNAL
-} SignalNumber;
+};
 
 static guint s_signals[SN_LAST_SIGNAL] = { 0 };
 
diff --git a/src/plugins/oops-utils.c b/src/plugins/oops-utils.c
index caa1d8d5d..a77b4424f 100644
--- a/src/plugins/oops-utils.c
+++ b/src/plugins/oops-utils.c
@@ -22,6 +22,8 @@
 #include "oops-utils.h"
 #include "libabrt.h"
 
+int g_abrt_oops_sleep_woke_up_on_signal;
+
 int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags)
 {
     unsigned errors = 0;
diff --git a/src/plugins/oops-utils.h b/src/plugins/oops-utils.h
index 5181f91c7..bdd61cac2 100644
--- a/src/plugins/oops-utils.h
+++ b/src/plugins/oops-utils.h
@@ -33,7 +33,7 @@ enum {
     ABRT_OOPS_PRINT_STDOUT      = 1 << 2,
 };
 
-int g_abrt_oops_sleep_woke_up_on_signal;
+extern int g_abrt_oops_sleep_woke_up_on_signal;
 
 int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags);
 unsigned abrt_oops_create_dump_dirs(GList *oops_list, const char *dump_location, const char *analyzer, int flags);
diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c
index a8dfc512a..4ecf8cb63 100644
--- a/src/plugins/xorg-utils.c
+++ b/src/plugins/xorg-utils.c
@@ -23,6 +23,8 @@
 
 #define DEFAULT_XORG_CRASH_REASON "Display server crashed"
 
+int g_abrt_xorg_sleep_woke_up_on_signal;
+
 int abrt_xorg_signaled_sleep(int seconds)
 {
     sigset_t set;
diff --git a/src/plugins/xorg-utils.h b/src/plugins/xorg-utils.h
index c53bc460d..d9f44681a 100644
--- a/src/plugins/xorg-utils.h
+++ b/src/plugins/xorg-utils.h
@@ -35,7 +35,7 @@ enum {
     ABRT_XORG_PRINT_STDOUT      = 1 << 2,
 };
 
-int g_abrt_xorg_sleep_woke_up_on_signal;
+extern int g_abrt_xorg_sleep_woke_up_on_signal;
 int abrt_xorg_signaled_sleep(int seconds);
 
 /*
-- 
2.24.1