mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-14 17:48:59 +02:00
merge
This commit is contained in:
parent
75ae6de81e
commit
8f810a2f1b
8 changed files with 42 additions and 26 deletions
|
|
@ -7,7 +7,7 @@ index 0129511c..10fc9b04 100644
|
|||
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
|
||||
|
||||
+// hacky fix for ps4
|
||||
+#if defined(_LIBCPP_HAS_MUSL_LIBC)
|
||||
+#if defined(__OPENORBIS__)
|
||||
+# define FIONBIO 0
|
||||
+# define FIONREAD 1
|
||||
+#endif
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ index 6669216..86a2faa 100644
|
|||
#endif
|
||||
|
||||
-#if !defined(HAS_SOCKLEN_T) && !defined(__socklen_t_defined)
|
||||
+#if !defined(_LIBCPP_HAS_MUSL_LIBC) && !defined(HAS_SOCKLEN_T) && !defined(__socklen_t_defined)
|
||||
+#if !defined(__OPENORBIS__) && !defined(HAS_SOCKLEN_T) && !defined(__socklen_t_defined)
|
||||
typedef int socklen_t;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ index 754c984c79..59e27afd3e 100644
|
|||
* target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
|
||||
* or `clang -maes -mpclmul`). */
|
||||
-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
|
||||
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(_LIBCPP_HAS_MUSL_LIBC)
|
||||
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__OPENORBIS__)
|
||||
#define MBEDTLS_AESNI_HAVE_INTRINSICS
|
||||
#endif
|
||||
/* For 32-bit, we only support intrinsics */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue