ircd::magick: Minor cleanup.

Havelet · Sep 25, 2019 · 6dcdbba · 6dcdbba
1 parent 7ea609e
commit 6dcdbba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/include/ircd/ircd.h b/include/ircd/ircd.h
@@ -65,10 +65,10 @@
 #include "rfc3986.h"
 #include "net/net.h"
 #include "server/server.h"
+#include "magick.h"
 #include "m/m.h"
 #include "resource/resource.h"
 #include "client.h"
-#include "magick.h"
 
 /// \brief Internet Relay Chat daemon. This is the principal namespace for IRCd.
 ///

diff --git a/modules/magick.cc b/modules/magick.cc
@@ -159,21 +159,15 @@ namespace ircd::magick
 	static void sig_pre(), sig_post();
 }
 
+/// List of signals from libmagick
 decltype(ircd::magick::sig_overrides)
 ircd::magick::sig_overrides
 {
 	#ifdef HAVE_SIGNAL_H
-	SIGABRT,
-	SIGBUS,
-	SIGCHLD,
-	SIGFPE,
-	SIGHUP,
-	SIGINT,
-	SIGQUIT,
-	SIGTERM,
-	SIGSEGV,
-	SIGXCPU,
-	SIGXFSZ,
+	SIGABRT,   SIGBUS,    SIGCHLD,
+	SIGFPE,    SIGHUP,    SIGINT,
+	SIGQUIT,   SIGTERM,   SIGSEGV,
+	SIGXCPU,   SIGXFSZ,
 	#endif HAVE_SIGNAL_H
 };
 
@@ -516,10 +510,6 @@ ircd::magick::display::display(const ImageInfo &info,
 // util (internal)
 //
 
-namespace ircd::magick
-{
-}
-
 template<class return_t,
          class function,
          class... args>