cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

main: Move fprintd_dbus_conn declaration to main.c

Browse Source 
There's no need to declare it as extern in the header as it is already
declared in the source files where it's used.

Fixes:
../src/device.c:51:25: error: redundant redeclaration of ‘fprintd_dbus_conn’ [-Werror=redundant-decls]
  51 | extern DBusGConnection *fprintd_dbus_conn;
     |                         ^~~~~~~~~~~~~~~~~
In file included from ../src/device.c:34:
../src/fprintd.h:29:25: note: previous declaration of ‘fprintd_dbus_conn’ was here
  29 | extern DBusGConnection *fprintd_dbus_conn;
     |                         ^~~~~~~~~~~~~~~~~
This commit is contained in:
Marco Trevisan (Treviño)
2020-01-27 19:10:57 +01:00
committed by Bastien Nocera
parent e2fd52190a
commit 130d6cdb63
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/fprintd.h
View File

@ -26,7 +26,6 @@
/* General */ /* General */
#define TIMEOUT 30 #define TIMEOUT 30
#define FPRINT_SERVICE_NAME "net.reactivated.Fprint" #define FPRINT_SERVICE_NAME "net.reactivated.Fprint"
extern DBusGConnection *fprintd_dbus_conn;
/* Errors */ /* Errors */
GQuark fprint_error_quark(void); GQuark fprint_error_quark(void);

2
src/main.c
View File

@ -35,7 +35,7 @@
fp_storage store; fp_storage store;
extern DBusGConnection *fprintd_dbus_conn; DBusGConnection *fprintd_dbus_conn = NULL;
static gboolean no_timeout = FALSE; static gboolean no_timeout = FALSE;
static gboolean g_fatal_warnings = FALSE; static gboolean g_fatal_warnings = FALSE;

2
src/manager.c
View File

@ -27,7 +27,7 @@
#include "fprintd.h" #include "fprintd.h"
DBusGConnection *fprintd_dbus_conn; extern DBusGConnection *fprintd_dbus_conn;
static gboolean fprint_manager_get_devices(FprintManager *manager, static gboolean fprint_manager_get_devices(FprintManager *manager,
GPtrArray **devices, GError **error); GPtrArray **devices, GError **error);