diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2015-02-24 01:26:06 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2015-02-24 01:26:06 +0100 |
| commit | 656b5d17d9b8bf16f1acaa7043f3c23ecd711617 (patch) | |
| tree | 4230b30575111d7d9c49580e9d0c9ea2de8382ae /src | |
| parent | f8ccc6b9737615bd843279630503ca5d150473c1 (diff) | |
qmicli,dms: avoid shadowing global 'timezone' variable
qmicli-dms.c: In function ‘get_time_ready’:
qmicli-dms.c:1585: error: declaration of ‘timezone’ shadows a global declaration
/usr/include/time.h:292: error: shadowed declaration is here
make[4]: *** [qmicli-qmicli-dms.o] Error 1
make[4]: Leaving directory `/usr/src/libqmi-1.13.4/src/qmicli'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/usr/src/libqmi-1.13.4/src/qmicli'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/usr/src/libqmi-1.13.4/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/src/libqmi-1.13.4'
make: *** [all] Error 2
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmicli/qmicli-dms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qmicli/qmicli-dms.c b/src/qmicli/qmicli-dms.c index ec31d04..6042bad 100644 --- a/src/qmicli/qmicli-dms.c +++ b/src/qmicli/qmicli-dms.c @@ -1582,7 +1582,7 @@ get_time_ready (QmiClientDms *client, QmiDmsTimeSource time_source; GError *error = NULL; gchar *str; - GTimeZone *timezone; + GTimeZone *time_zone; GDateTime *gpstime_epoch; GDateTime *computed_epoch; @@ -1609,8 +1609,8 @@ get_time_ready (QmiClientDms *client, NULL); /* January 6th 1980 */ - timezone = g_time_zone_new_utc (); - gpstime_epoch = g_date_time_new (timezone, 1980, 1, 6, 0, 0, 0.0); + time_zone = g_time_zone_new_utc (); + gpstime_epoch = g_date_time_new (time_zone, 1980, 1, 6, 0, 0, 0.0); computed_epoch = g_date_time_add_seconds (gpstime_epoch, ((gdouble) time_count / 1000.0)); str = g_date_time_format (computed_epoch, "%F %T"); @@ -1648,7 +1648,7 @@ get_time_ready (QmiClientDms *client, } g_date_time_unref (gpstime_epoch); - g_time_zone_unref (timezone); + g_time_zone_unref (time_zone); qmi_message_dms_get_time_output_unref (output); shutdown (TRUE); |