From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 9 Feb 2015 10:52:31 +0000 (+0000)
Subject: Small fixes.
X-Git-Tag: 0.9.0~735
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c4e4a60be8bde947c7a93841fc90a9e31ebc6f1e;p=rspamd.git

Small fixes.
---

diff --git a/contrib/blake2/blake2-impl.h b/contrib/blake2/blake2-impl.h
index 5ac7a430f..2a937904b 100644
--- a/contrib/blake2/blake2-impl.h
+++ b/contrib/blake2/blake2-impl.h
@@ -14,8 +14,13 @@
 #ifndef __BLAKE2_IMPL_H__
 #define __BLAKE2_IMPL_H__
 
+#include "config.h"
 #include <stdint.h>
 
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define NATIVE_LITTLE_ENDIAN
+#endif
+
 static inline uint32_t load32( const void *src )
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
diff --git a/contrib/blake2/blake2.h b/contrib/blake2/blake2.h
index 7011c57f5..7d611f9a4 100644
--- a/contrib/blake2/blake2.h
+++ b/contrib/blake2/blake2.h
@@ -17,11 +17,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#ifndef BLAKE_ALIGN
+#ifndef BLAKE_ALIGNED
 #if defined(_MSC_VER)
-# define BLAKE_ALIGN(x) __declspec(align(x))
+# define BLAKE_ALIGNED(x) __declspec(align(x))
 #else
-# define BLAKE_ALIGN(x) __attribute__((aligned(x)))
+# define BLAKE_ALIGNED(x) __attribute__((aligned(x)))
 #endif
 #endif
 
@@ -56,7 +56,7 @@ extern "C" {
     uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
   } blake2b_param;
 
-  BLAKE_ALIGN( 64 ) typedef struct __blake2b_state
+  BLAKE_ALIGNED( 64 ) typedef struct __blake2b_state
   {
     uint64_t h[8];
     uint64_t t[2];
diff --git a/src/libmime/CMakeLists.txt b/src/libmime/CMakeLists.txt
index c9c4318b8..94f2f6e89 100644
--- a/src/libmime/CMakeLists.txt
+++ b/src/libmime/CMakeLists.txt
@@ -16,7 +16,7 @@ SET_TARGET_PROPERTIES(rspamd-mime PROPERTIES LINKER_LANGUAGE C)
 SET_TARGET_PROPERTIES(rspamd-mime PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB")
 TARGET_LINK_LIBRARIES(rspamd-mime rspamd-server)
 TARGET_LINK_LIBRARIES(rspamd-mime rspamd-stat)
-TARGET_LINK_LIBRARIES(rspamd-mime rspamd-util)      
+TARGET_LINK_LIBRARIES(rspamd-mime rspamd-util)
 IF(CMAKE_COMPILER_IS_GNUCC)
 	SET_TARGET_PROPERTIES(rspamd-mime PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB -fno-strict-aliasing")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0684a6026..99c825199 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,10 +17,13 @@ ADD_EXECUTABLE(rspamd-test EXCLUDE_FROM_ALL ${TESTSRC})
 SET_TARGET_PROPERTIES(rspamd-test PROPERTIES LINKER_LANGUAGE C)
 SET_TARGET_PROPERTIES(rspamd-test PROPERTIES COMPILE_FLAGS "-DRSPAMD_TEST")
 
+TARGET_LINK_LIBRARIES(rspamd-test rspamd-stat)
 TARGET_LINK_LIBRARIES(rspamd-test rspamd-mime)
 TARGET_LINK_LIBRARIES(rspamd-test rspamd-server)
 TARGET_LINK_LIBRARIES(rspamd-test rspamd-util)
 TARGET_LINK_LIBRARIES(rspamd-test rspamd-lua)
+TARGET_LINK_LIBRARIES(rspamd-test rspamd-cryptobox)
+TARGET_LINK_LIBRARIES(rspamd-test stemmer)
 
 TARGET_LINK_LIBRARIES(rspamd-test event)
 IF(HAVE_LIBEVENT2)
diff --git a/test/rspamd_http_test.c b/test/rspamd_http_test.c
index 581a4c284..cdcfef967 100644
--- a/test/rspamd_http_test.c
+++ b/test/rspamd_http_test.c
@@ -27,6 +27,7 @@
 #include "http.h"
 #include "tests.h"
 #include "ottery.h"
+#include "cryptobox.h"
 
 static const int file_blocks = 8;
 static const int pconns = 100;