mirror of
https://github.com/shadps4-emu/ext-zlib-ng.git
synced 2024-10-07 08:23:37 +00:00
Move cpu_feature includes out of zutil.h.
This commit is contained in:
parent
0911015e48
commit
a5a0b40e17
@ -24,6 +24,8 @@
|
||||
#include <wmmintrin.h>
|
||||
#include <smmintrin.h> // _mm_extract_epi32
|
||||
|
||||
#include "x86.h"
|
||||
|
||||
#include "../../crc32_fold.h"
|
||||
|
||||
#ifdef X86_VPCLMULQDQ_CRC
|
||||
|
@ -4,7 +4,8 @@
|
||||
*/
|
||||
|
||||
#include "zbuild.h"
|
||||
#include "zutil.h"
|
||||
|
||||
#include "cpu_features.h"
|
||||
|
||||
Z_INTERNAL void cpu_check_features(void) {
|
||||
static int features_checked = 0;
|
||||
|
@ -9,8 +9,15 @@
|
||||
#include "deflate.h"
|
||||
#include "crc32_fold.h"
|
||||
|
||||
#ifdef X86_FEATURES
|
||||
#if defined(X86_FEATURES)
|
||||
# include "arch/x86/x86.h"
|
||||
# include "fallback_builtins.h"
|
||||
#elif defined(ARM_FEATURES)
|
||||
# include "arch/arm/arm.h"
|
||||
#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
|
||||
# include "arch/power/power.h"
|
||||
#elif defined(S390_FEATURES)
|
||||
# include "arch/s390/s390.h"
|
||||
#endif
|
||||
|
||||
extern void cpu_check_features();
|
||||
|
@ -48,6 +48,7 @@
|
||||
*/
|
||||
|
||||
#include "zbuild.h"
|
||||
#include "cpu_features.h"
|
||||
#include "deflate.h"
|
||||
#include "deflate_p.h"
|
||||
#include "functable.h"
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include "zbuild.h"
|
||||
#include "zutil.h"
|
||||
#include "cpu_features.h"
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
#include "inffast.h"
|
||||
|
10
zutil.h
10
zutil.h
@ -259,14 +259,4 @@ void Z_INTERNAL zng_cfree(void *opaque, void *ptr);
|
||||
# define ALIGNED_(x) __declspec(align(x))
|
||||
#endif
|
||||
|
||||
#if defined(X86_FEATURES)
|
||||
# include "arch/x86/x86.h"
|
||||
#elif defined(ARM_FEATURES)
|
||||
# include "arch/arm/arm.h"
|
||||
#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
|
||||
# include "arch/power/power.h"
|
||||
#elif defined(S390_FEATURES)
|
||||
# include "arch/s390/s390.h"
|
||||
#endif
|
||||
|
||||
#endif /* ZUTIL_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user