* FreeBSD compile fixes

svn: 207

Makefile.in

@@ -111,7 +111,8 @@ eggautoconf:
 
 packconf: utils
 	@./makesettings pack/pack.cfg src/settings.tmp
-	@(if test "x`diff -urN src/settings.tmp src/settings.c`" != "x"; then \
+	@(touch src/settings.c; \
+	if test "x`diff -qurN src/settings.tmp src/settings.c`" != "x"; then \
 	cp -f src/settings.tmp src/settings.c; \
 	fi)
 

misc/maketcl

@@ -5,5 +5,4 @@ cd tcl8.4.4/
 cd unix/
 ./configure --prefix=${HOME} --exec-prefix=${HOME} --disable-shared
 make && make install
-
-
+rm -rf tcl8.4.4*

src/mod/compress.mod/compress.c

@@ -30,7 +30,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include <zlib.h>
 
 #include "src/mod/module.h"
 #include "share.mod/share.h"

src/mod/irc.mod/irc.c

@@ -802,7 +802,7 @@ static void maybe_revenge(struct chanset_t *chan, char *whobad,
 
 /* Set the key.
  */
-static void setkey(struct chanset_t *chan, char *k)
+static void my_setkey(struct chanset_t *chan, char *k)
 {
   nfree(chan->channel.key);
   if (k == NULL) {

src/mod/irc.mod/irc.h

@@ -55,7 +55,7 @@ static void request_op(struct chanset_t *);
 static void request_in(struct chanset_t *);
 static void reset_chan_info(struct chanset_t *);
 static void recheck_channel(struct chanset_t *, int);
-static void setkey(struct chanset_t *, char *);
+static void my_setkey(struct chanset_t *, char *);
 static void maybe_revenge(struct chanset_t *, char *, char *, int);
 static int detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
 			     char *);

src/mod/irc.mod/mode.c

@@ -1091,7 +1091,7 @@ Context;
 	  }
 	  check_tcl_mode(nick, from, u, chan->dname, ms2, op);
 	  if (ms2[0] == '+') {
-	    setkey(chan, op);
+	    my_setkey(chan, op);
 	    if (channel_active(chan))
 	      got_key(chan, nick, from, op);
 	  } else {
@@ -1102,7 +1102,7 @@ Context;
 		       && !chan_master(user))
 		add_mode(chan, '+', 'k', chan->key_prot);
 	    }
-	    setkey(chan, NULL);
+	    my_setkey(chan, NULL);
 	  }
 	  break;
 	case 'o':