Merge branch 'maint'

* maint:
  irc.arcti.ca renamed to irc.shaw.ca
  Clean up some header pollution.

doc/UPDATES.md

@@ -1,6 +1,9 @@
 # master
   * Require C++11 compiler support (G++ 4.7+, clang32+)
 
+# maint
+  * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+
 # 1.4.6
   * Disable demo TCL support by default to prevent confusion during build.
   * Avoid apparmor ptrace(2) warnings on Ubuntu

doc/settings.txt

@@ -35,9 +35,9 @@ irc.homelien.no
 irc.inet.tele.dk
 irc.underworld.no
 #CA
-irc.arcti.ca
 irc.choopa.ca
 irc.teksavvy.ca
+irc.shaw.ca
 
 :servers6
 efnet.ipv6.port80.se

src/chan.h

@@ -330,9 +330,6 @@ struct chanset_t {
 #define CHAN_STOP_CYCLE     BIT9	/* Some efnetservers have defined NO_CHANOPS_WHEN_SPLIT */
 
 /* prototypes */
-memberlist *ismember(const struct chanset_t *, const char *);
-struct chanset_t *findchan(const char *name);
-struct chanset_t *findchan_by_dname(const char *name);
 
 /* is this channel +s/+p? */
 #define channel_hidden(chan) (chan->channel.mode & (CHANPRIV | CHANSEC))

src/chanprog.cc

@@ -865,7 +865,7 @@ samechans(const char *nick, const char *delim)
   return ret;
 }
 
-struct chanset_t* find_common_opped_chan(bd::String nick) {
+static struct chanset_t* find_common_opped_chan(bd::String nick) {
   for (struct chanset_t* chan = chanset; chan; chan = chan->next) {
     if (channel_active(chan) && (me_op(chan) || me_voice(chan))) {
       if (ismember(chan, nick.c_str()))

src/chanprog.h

@@ -35,6 +35,11 @@ void privmsg(bd::String target, bd::String msg, int idx);
 void notice(bd::String target, bd::String msg, int idx);
 void keyx(const bd::String& target);
 void set_fish_key(char *, bd::String);
+struct userrec *check_chanlist(const char *);
+struct userrec *check_chanlist_hand(const char *);
+memberlist *ismember(const struct chanset_t *, const char *);
+struct chanset_t *findchan(const char *name);
+struct chanset_t *findchan_by_dname(const char *name);
 
 extern struct chanset_t		*chanset, *chanset_default;
 extern char			admin[], origbotnick[HANDLEN + 1], origbotname[NICKLEN], jupenick[NICKLEN], botname[NICKLEN], *def_chanset;

src/userrec.h

@@ -21,6 +21,8 @@ int write_userfile(int);
 void touch_laston(struct userrec *, char *, time_t);
 void user_del_chan(char *);
 struct userrec *host_conflicts(char *);
+struct userrec *get_user_by_handle(struct userrec *, const char *);
+struct userrec *get_user_by_host(char *);
 
 extern struct userrec  		*userlist, *lastuser;
 extern int			cache_hit, cache_miss, userfile_perm;

src/users.h

@@ -148,11 +148,6 @@ extern struct igrec *global_ign;
  * Note: Flags are in eggdrop.h
  */
 
-struct userrec *get_user_by_handle(struct userrec *, const char *);
-struct userrec *get_user_by_host(char *);
-struct userrec *check_chanlist(const char *);
-struct userrec *check_chanlist_hand(const char *);
-
 /* All the default userentry stuff, for code re-use
  */
 bool def_unpack(struct userrec *u, struct user_entry *e);