Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ

[srvx.git] / src / global.c

diff --git a/src/global.c b/src/global.c
index 69ab616d4c73e0d283e5b4712c6d734153e2e566..4f263e2dec2fb5688ba5a7df34cb69ddeed7e7ca 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -94,7 +94,11 @@ static struct
     unsigned long db_backup_frequency;
 } global_conf;
 
-#define global_notice(target, format...) send_message(target , global , ## format)
+#if defined(GCC_VARMACROS)
+# define global_notice(target, ARGS...) send_message(target, global, ARGS)
+#elif defined(C99_VARMACROS)
+# define global_notice(target, ...) send_message(target, global, __VA_ARGS__)
+#endif
 
 void message_expire(void *data);
 
@@ -539,11 +543,11 @@ static GLOBAL_FUNC(cmd_messages)
     return 1;
 }
 
-static int
+static void
 global_process_user(struct userNode *user)
 {
     if(IsLocal(user) || self->uplink->burst || user->uplink->burst)
-        return 0;
+        return;
     send_messages(user, MESSAGE_RECIPIENT_LUSERS, 1);
 
     /* only alert on new usercount if the record was broken in the last
@@ -557,8 +561,6 @@ global_process_user(struct userNode *user)
         global_message(MESSAGE_RECIPIENT_OPERS, message);
         last_max_alert = now;
     }
-
-    return 0;
 }
 
 static void