Merge branch 'master' of git+ssh://gnunet.org/gnunet

3 files changed, 16 insertions, 11 deletions

diff --git a/.mailmap b/.mailmap
index e15a72268..2ca867b4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,14 +14,15 @@ Jeffrey Burdges <burdges@gnunet.org>
 Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
 Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <mschanzenbach@posteo.de>
 Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Martin Schanzenbach <mschanzenbach@posteo.de>
-nikita <tek.no.katze@gmail.com> ng0@n0.is <ng0@n0.is>
-nikita <tek.no.katze@gmail.com> ng0 <ng0@n0.is>
-nikita <tek.no.katze@gmail.com>
-nikita <tek.no.katze@gmail.com> ng0 <contact.ng0@cryptolab.net>
-nikita <tek.no.katze@gmail.com> ng0 <ng0@infotropique.org>
-nikita <tek.no.katze@gmail.com>  N. 'ng0' Gillmann <ngillmann@runbox.com>
-nikita <tek.no.katze@gmail.com> ng0 <ng0@we.make.ritual.n0.is>
-nikita <tek.no.katze@gmail.com>  Nils Gillmann <ng0@n0.is>
+nikita <nikita@n0.is>
+nikita <nikita@n0.is> nikita <tek.no.katze@gmail.com>
+nikita <nikita@n0.is> ng0@n0.is <ng0@n0.is>
+nikita <nikita@n0.is> ng0 <ng0@n0.is>
+nikita <nikita@n0.is> ng0 <contact.ng0@cryptolab.net>
+nikita <nikita@n0.is> ng0 <ng0@infotropique.org>
+nikita <nikita@n0.is>  N. 'ng0' Gillmann <ngillmann@runbox.com>
+nikita <nikita@n0.is> ng0 <ng0@we.make.ritual.n0.is>
+nikita <nikita@n0.is>  Nils Gillmann <ng0@n0.is>
 t3sserakt <t3ss@posteo.de>
 t3sserakt <t3ss@posteo.de> <t3sserakt@posteo.de>
 tg(x) <*@tg-x.net>
diff --git a/AUTHORS b/AUTHORS
index d44dc3920..061d51379 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,7 +70,7 @@ Marko Räihä
 Michael John Wensley <michael@wensley.org.uk>
 Milan Bouchet-Valat <nalimilan@club.fr>
 Nathan Evans <evans@net.in.tum.de>
-Nils Gillmann <ng0@n0.is> [ Documentation export to Texinfo ]
+nikita <nikita@n0.is> [ Documentation export to Texinfo ]
 Paul Ruth <ruth@cs.purdue.edu>
 Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de>
 Renaldo Ferreira <rf@cs.purdue.edu>
@@ -124,8 +124,8 @@ Nix:              viric, rahul
 OpenWrt/LEDE:     Daniel Golle <daniel@makrotopia.org>
 macOS:            Jussi Eloranta <eloranta@cc.jyu.fi>
 Gentoo:           Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>
-                  N. Gillmann <ng0@n0.is>
-NetBSD pkgsrc:    N. Gillmann <ng0@n0.is>
+                  nikita <nikita@n0.is>
+NetBSD pkgsrc:    nikita <nikita@NetBSD.org>
 
 If you have contributed and are not listed here, please
 notify one of the maintainers in order to be added.
diff --git a/src/include/platform.h b/src/include/platform.h
index 3b07f47ea..baaf26ad6 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -45,6 +45,10 @@
 #include <sys/types.h>
 #endif
 
+#ifdef __clang__
+#undef HAVE_STATIC_ASSERT
+#endif
+
 /**
  * These may be expensive, but good for debugging...
  */