Merge branch 'master' into next

* master:
  Make bfd happy with the OpenSSL forward compat
  Revert "No need to call irc_log as it does nothing."

src/generate_defs.sh

@@ -31,6 +31,7 @@ for file in ${files}; do
 done
 
 echo "{" > $exportsFile
+echo "bfd_exports_stub;" >> $exportsFile
 for file in ${files}; do
   suffix=${file##*.}
   basename=${file%%.*}

src/log.cc

@@ -327,7 +327,6 @@ void putlog(int type, const char *chname, const char *format, ...)
   }
 }
 
-#if 0
 void
 irc_log(struct chanset_t *chan, const char *format, ...)
 {
@@ -355,5 +354,4 @@ irc_log(struct chanset_t *chan, const char *format, ...)
 */
 #endif 
 }
-#endif
 /* vim: set sts=2 sw=2 ts=8 et: */

src/log.h

@@ -33,11 +33,7 @@ void putlog (int, const char *, const char *, ...) __attribute__((format(printf,
 int logmodes(const char *) __attribute__((pure));
 char *masktype(int);
 char *maskname(int);
-#if 0
 void irc_log(struct chanset_t *, const char *, ...) __attribute__((format(printf, 2, 3)));
-#else
-#define irc_log(...) do {} while (0)
-#endif
 void logfile(int type, const char *msg);
 void logfile_close(void);
 

src/main.cc

@@ -934,4 +934,9 @@ int main(int argc, char **argv)
 
   return 0;		/* never reached but what the hell */
 }
+
+/* bfd doesn't link empty --dynamic-list file. */
+void bfd_exports_stub(void)
+{
+}
 /* vim: set sts=2 sw=2 ts=8 et: */