Browse Source

Merge branch 'master' into next

* master:
  Update bdlib to 33b6871ccdd6
  GCC 9 points out these consts make no sense
  Update bdlib to f50c1eb2ae3a751e
Bryan Drewery 6 years ago
parent
commit
ea82c68663
4 changed files with 2 additions and 11 deletions
  1. 1 1
      lib/bdlib
  2. 1 5
      src/log.h
  3. 0 1
      src/main.cc
  4. 0 4
      src/shell.h

+ 1 - 1
lib/bdlib

@@ -1 +1 @@
-Subproject commit be915279cdc3db602d7da1d3691a53b24bcf5654
+Subproject commit 33b6871ccdd677925471beb0229b2e7cb2f89eed

+ 1 - 5
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);
-void irc_log(struct chanset_t *, const char *, ...) __attribute__((format(printf, 2, 3)))
-#ifndef NOTYET
-  __attribute__((const))
-#endif
-  ;
+void irc_log(struct chanset_t *, const char *, ...) __attribute__((format(printf, 2, 3)));
 void logfile(int type, const char *msg);
 void logfile_close(void);
 

+ 0 - 1
src/main.cc

@@ -936,7 +936,6 @@ int main(int argc, char **argv)
 }
 
 /* bfd doesn't link empty --dynamic-list file. */
-void bfd_exports_stub(void) __attribute__((const));
 void bfd_exports_stub(void)
 {
 }

+ 0 - 4
src/shell.h

@@ -55,11 +55,7 @@ int shell_exec(const char *, const char *, char **, char **, bool = 0);
 int simple_exec(const char* argv[]);
 void check_last();
 void check_promisc();
-#if defined(DEBUG) && !defined(PR_SET_PTRACER_ANY)
-void check_trace(int) __attribute__((const));
-#else
 void check_trace(int);
-#endif
 void check_crontab();
 void crontab_del();
 int crontab_exists(bd::Stream* = NULL, bool = 0);