summaryrefslogtreecommitdiff
path: root/src/sync-alarm.c
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-15 12:44:21 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-15 12:44:21 +0000
commit4197eaf7b57056454cec3112683d84a3d0d7b194 (patch)
tree831813de1e8192e5a493200783ae17b770fcc61d /src/sync-alarm.c
parent85617e012de1df43070bd4fba80ecce50dd87735 (diff)
downloadconntrack-tools-4197eaf7b57056454cec3112683d84a3d0d7b194.tar.gz
conntrack-tools-4197eaf7b57056454cec3112683d84a3d0d7b194.zip
Max Kellermann <max@duempel.org>:
the global variable "alarm" conflicts with the alarm() function from unistd.h. resolve that conflict by giving those two global variables a better name.
Diffstat (limited to 'src/sync-alarm.c')
-rw-r--r--src/sync-alarm.c2
1 files changed, 1 insertions, 1 deletions
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,