kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 18:15:18 -07:00
Code Releases Wiki Activity

Merge branch 'master' of github.com:jedisct1/libsodium

Browse Source 
* 'master' of github.com:jedisct1/libsodium:
  midipix support (#1315)
This commit is contained in:
Frank Denis 2023-09-14 22:25:35 +02:00
commit c7df4b0681
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -712,7 +712,7 @@ AS_IF([test "$enable_asm" != "no"],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
]], [[ ]], [[
#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) || defined(__midipix__)
# error Windows x86_64 calling conventions are not supported yet # error Windows x86_64 calling conventions are not supported yet
# endif # endif
/* neat */ /* neat */

2
src/libsodium/randombytes/internal/randombytes_internal_random.c
View File

@ -32,6 +32,8 @@
# define HAVE_LINUX_COMPATIBLE_GETRANDOM # define HAVE_LINUX_COMPATIBLE_GETRANDOM
# endif # endif
# endif # endif
#elif defined(__midipix__)
# define HAVE_LINUX_COMPATIBLE_GETRANDOM
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
# include <sys/param.h> # include <sys/param.h>
# if defined(__FreeBSD_version) && __FreeBSD_version >= 1200000 # if defined(__FreeBSD_version) && __FreeBSD_version >= 1200000

2
src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c
View File

@ -30,6 +30,8 @@
# define HAVE_LINUX_COMPATIBLE_GETRANDOM # define HAVE_LINUX_COMPATIBLE_GETRANDOM
# endif # endif
# endif # endif
#elif defined(__midipix__)
# define HAVE_LINUX_COMPATIBLE_GETRANDOM
#elif defined(__FreeBSD__) || defined(__DragonFly__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
# include <sys/param.h> # include <sys/param.h>
# if (defined(__FreeBSD_version) && __FreeBSD_version >= 1200000) || \ # if (defined(__FreeBSD_version) && __FreeBSD_version >= 1200000) || \