Merge branch 'develop' into cmake

Conflicts:
	driver/others/memory.c

diff --cc driver/others/memory.c
index 78aee51,fca5161..ba3dc8a
--- 1/driver/others/memory.c
--- 2/driver/others/memory.c
+++ b/driver/others/memory.c
@@@ -139,9 -139,9 +139,12 @@@ USE OF THIS SOFTWARE, EVEN IF ADVISED O
  
  #define BITMASK(a, b, c) ((((a) >> (b)) & (c)))
  
 -#if defined(OS_DARWIN) && defined(C_GCC)
 +#if defined(_MSC_VER) && !defined(__clang__)
 +#define CONSTRUCTOR __cdecl
 +#define DESTRUCTOR __cdecl
++#elif defined(OS_DARWIN) && defined(C_GCC)
+ #define CONSTRUCTOR   __attribute__ ((constructor))
+ #define DESTRUCTOR    __attribute__ ((destructor))
  #else
  #define CONSTRUCTOR   __attribute__ ((constructor(101)))
  #define DESTRUCTOR    __attribute__ ((destructor(101)))