cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

time_t -> long

Browse Source
This commit is contained in:
ajacoutot 2012-10-18 13:55:27 +00:00
parent 7335f84678
commit 32a9d93edb
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.179 2012/10/16 11:56:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.180 2012/10/18 13:55:27 ajacoutot Exp $
SHARED_ONLY= Yes
@ -11,8 +11,8 @@ GNOME_VERSION= 3.6.1
PKGNAME-main= ${DISTNAME}
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}
REVISION-main= 0
REVISION-plugins= 0
REVISION-main= 1
REVISION-plugins= 1
# NOTE: when R changes, increment EVO_VERSION accordingly and bump:
# mail/evolution-ews

28
mail/evolution/patches/patch-calendar_alarm-notify_alarm_c
View File

@ -1,24 +1,42 @@
$OpenBSD: patch-calendar_alarm-notify_alarm_c,v 1.2 2012/10/18 12:29:43 ajacoutot Exp $
$OpenBSD: patch-calendar_alarm-notify_alarm_c,v 1.3 2012/10/18 13:55:27 ajacoutot Exp $
XXX remove when we have a 64-bit time_t
--- calendar/alarm-notify/alarm.c.orig Wed Mar 28 09:20:43 2012
+++ calendar/alarm-notify/alarm.c Wed Mar 28 09:22:27 2012
--- calendar/alarm-notify/alarm.c.orig Sun Sep 16 17:05:49 2012
+++ calendar/alarm-notify/alarm.c Thu Oct 18 15:35:30 2012
@@ -76,7 +76,7 @@ pop_alarm (void)
static gboolean
alarm_ready_cb (gpointer data)
{
- time_t now;
+ long int now;
+ long now;
if (!alarms) {
g_warning ("Alarm triggered, but no alarm present\n");
@@ -97,7 +97,7 @@ alarm_ready_cb (gpointer data)
if (ar->trigger > now)
break;
- debug (("Process alarm with trigger %lu", ar->trigger));
+ debug (("Process alarm with trigger %lu", (long)ar->trigger));
notify_id = ar;
ar_copy = *ar;
@@ -131,7 +131,7 @@ setup_timeout (void)
{
const AlarmRecord *ar;
guint diff;
- time_t now;
+ long int now;
+ long now;
if (!alarms) {
g_warning ("No alarm to setup\n");
@@ -153,7 +153,7 @@ setup_timeout (void)
/* Add the time out */
debug (("Setting timeout for %d.%2d (from now) %lu %lu",
- diff / 60, diff % 60, ar->trigger, now));
+ diff / 60, diff % 60, (long)ar->trigger, now));
debug ((" %s", ctime (&ar->trigger)));
debug ((" %s", ctime (&now)));
timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL);