4 files changed, 12 insertions, 14 deletions
diff --git a/src/libcryptobox/blake2/blake2.h b/src/libcryptobox/blake2/blake2.h
index 9966c66d2..3da1958ae 100644
--- a/src/libcryptobox/blake2/blake2.h
+++ b/src/libcryptobox/blake2/blake2.h
@@ -20,13 +20,13 @@
 extern "C" {
 #endif
 
-enum blake2b_constant {
-	BLAKE2B_BLOCKBYTES = 128,
-	BLAKE2B_OUTBYTES = 64,
-	BLAKE2B_KEYBYTES = 64,
-	BLAKE2B_SALTBYTES = 16,
-	BLAKE2B_PERSONALBYTES = 16
-};
+
+#define BLAKE2B_BLOCKBYTES 128
+#define BLAKE2B_OUTBYTES 64
+#define BLAKE2B_KEYBYTES 64
+#define BLAKE2B_SALTBYTES 16
+#define BLAKE2B_PERSONALBYTES 16
+
 
 typedef struct blake2b_state_t {
 	unsigned char opaque[256];
diff --git a/src/libcryptobox/chacha20/chacha.h b/src/libcryptobox/chacha20/chacha.h
index f69a63db9..7f93a4517 100644
--- a/src/libcryptobox/chacha20/chacha.h
+++ b/src/libcryptobox/chacha20/chacha.h
@@ -26,9 +26,8 @@
 #ifndef CHACHA_H_
 #define CHACHA_H_
 
-enum chacha_constants {
-	CHACHA_BLOCKBYTES = 64,
-};
+
+#define CHACHA_BLOCKBYTES 64
 
 typedef struct chacha_state_internal_t {
 	unsigned char s[48];
diff --git a/src/libcryptobox/poly1305/ref-64.c b/src/libcryptobox/poly1305/ref-64.c
index 48d5fbcc6..cceb1476d 100644
--- a/src/libcryptobox/poly1305/ref-64.c
+++ b/src/libcryptobox/poly1305/ref-64.c
@@ -7,9 +7,8 @@
 #include "config.h"
 #include "poly1305.h"
 #include "poly1305_internal.h"
-enum {
-	POLY1305_BLOCK_SIZE = 16
-};
+
+#define POLY1305_BLOCK_SIZE 16
 
 typedef struct poly1305_state_ref_t {
 	uint64_t r[3];
diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index a6f1adaf8..5cbc1c044 100644
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -1055,7 +1055,7 @@ rspamd_inet_address_listen (const rspamd_inet_addr_t *addr, gint type,
 		}
 	}
 
-	if (type != SOCK_DGRAM) {
+	if (type != (int)SOCK_DGRAM) {
 
 		if (addr->af == AF_UNIX) {
 			path = addr->u.un->addr.sun_path;