diff options
| author | Federico G. Schwindt <fgsch@openbsd.org> | 2014-02-17 15:48:12 +0100 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2014-02-17 15:49:34 +0100 |
| commit | a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc (patch) | |
| tree | 37bd0d9d6f6341b1933648aa9089d19c28a347be | |
| parent | bc7c6d2d285509c7fcd1899c866838bd278fab58 (diff) | |
| download | startup-notification-a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc.tar.gz | |
Fix crash on 32bit architectures where time_t is 64 bit
This is an ABI change on platforms where sizeof(time_t) doesn't equal
sizeof(long). For most platforms this change shouldn't make a difference
at present. OpenBSD recently switched to 64bit time_t on all architectures
to avoid time_t overflow in 2038 on 32bit machines.
This fix extends to consumers of startup-notification, for instance
the window manager of XFCE, which is how I got involved in this.
See http://mail.xfce.org/pipermail/xfce4-dev/2014-February/030611.html
and follow-ups. The XFCE devs pointed out that my patch to fix a
crash in XFCE's window manager depends on this startup-notification patch.
Signed-off-by: Julien Danjou <julien@danjou.info>
| -rw-r--r-- | libsn/sn-monitor.c | 8 | ||||
| -rw-r--r-- | libsn/sn-monitor.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c index 2a9ad16..f419bc1 100644 --- a/libsn/sn-monitor.c +++ b/libsn/sn-monitor.c @@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *sequence) **/ void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, - long *tv_sec, - long *tv_usec) + time_t *tv_sec, + suseconds_t *tv_usec) { if (tv_sec) *tv_sec = sequence->initiation_time.tv_sec; @@ -386,8 +386,8 @@ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, **/ void sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence, - long *tv_sec, - long *tv_usec) + time_t *tv_sec, + suseconds_t *tv_usec) { /* for now the same as get_initiated_time */ if (tv_sec) diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h index b58581f..2f639df 100644 --- a/libsn/sn-monitor.h +++ b/libsn/sn-monitor.h @@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id (SnStartupSequence *se int sn_startup_sequence_get_screen (SnStartupSequence *sequence); void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, - long *tv_sec, - long *tv_usec); + time_t *tv_sec, + suseconds_t *tv_usec); void sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence, - long *tv_sec, - long *tv_usec); + time_t *tv_sec, + suseconds_t *tv_usec); void sn_startup_sequence_complete (SnStartupSequence *sequence); |