Merge pull request #3180

1dfed567 Fixed #if instead of #ifdef (Matt Little)
7c442453 Support building cncrypto lib with msvc (Matt Little)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:19:42 +01:00
commit ba22928d4b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 24 additions and 5 deletions

View file

@ -34,7 +34,9 @@
#include "hash-ops.h"
#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
#ifdef _MSC_VER
#include <malloc.h>
#elif !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
#include <alloca.h>
#else
#include <stdlib.h>