summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parent85617e012de1df43070bd4fba80ecce50dd87735 (diff)
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 'include')
-rw-r--r--include/sync.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sync.h b/include/sync.h
index e6ce327..39e0f46 100644
--- a/include/sync.h
+++ b/include/sync.h
@@ -18,7 +18,7 @@ struct sync_mode {
void (*run)(void);
};
-extern struct sync_mode alarm;
-extern struct sync_mode ftfw;
+extern struct sync_mode sync_alarm;
+extern struct sync_mode sync_ftfw;
#endif