From 4197eaf7b57056454cec3112683d84a3d0d7b194 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Tue, 15 Jan 2008 12:44:21 +0000 Subject: Max Kellermann : the global variable "alarm" conflicts with the alarm() function from unistd.h. resolve that conflict by giving those two global variables a better name. --- src/sync-alarm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sync-alarm.c') diff --git a/src/sync-alarm.c b/src/sync-alarm.c index 3d20867..1dcfacd 100644 --- a/src/sync-alarm.c +++ b/src/sync-alarm.c @@ -106,7 +106,7 @@ static int alarm_recv(const struct nethdr *net) return 0; } -struct sync_mode alarm = { +struct sync_mode sync_alarm = { .internal_cache_flags = LIFETIME, .external_cache_flags = TIMER | LIFETIME, .internal_cache_extra = &cache_alarm_extra, -- cgit v1.2.3