Commitdbe0f38

Charlie Hayden

authored

Merge pull request#3583 from cgohlke/patch-1

Fix build errors on win_arm64

2 parents7b932a3 +a92a8f5 commitdbe0f38Copy full SHA for dbe0f38

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,8 @@ def replace_scale_mmx():`
`767`	`767`	`return`
`768`	`768`
`769`	`769`
`770`		`-replace_scale_mmx()`
	`770`	`+ifnot'ARM64'insys.version:`
	`771`	`+replace_scale_mmx()`
`771`	`772`
`772`	`773`	`# clean up the list of extensions`
`773`	`774`	`foreinextensions[:]:`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,11 @@`
`29`	`29`	`#if !defined(SCALE_HEADER)`
`30`	`30`	`#defineSCALE_HEADER`
`31`	`31`
`32`		`-#if (defined(__GNUC__)&& \`
`33`		`- ((defined(__x86_64__)&& !defined(_NO_MMX_FOR_X86_64))\|\| \`
`34`		`- defined(__i386__)))\|\| \`
`35`		`- (defined(MS_WIN32)&& !(defined(_M_X64)&& defined(_NO_MMX_FOR_X86_64)))`
	`32`	`+#if (defined(__GNUC__)&& \`
	`33`	`+ ((defined(__x86_64__)&& !defined(_NO_MMX_FOR_X86_64))\|\| \`
	`34`	`+ defined(__i386__)))\|\| \`
	`35`	`+ (defined(MS_WIN32)&& !((defined(_M_X64)\|\| defined(_M_ARM64))&& \`
	`36`	`+ defined(_NO_MMX_FOR_X86_64)))`
`36`	`37`	`#defineSCALE_MMX_SUPPORT`
`37`	`38`
`38`	`39`	`/* These functions implement an area-averaging shrinking filter in the`

Comments

(0)