wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-27 19:07:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

I Did Not Clobberbuild, What Happens Next Is Shocking

Browse source
This commit is contained in:
wuggy 2026-04-24 00:22:03 -07:00
commit a03f914c47
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
media/ffvpx/config.h
View file

@ -28,8 +28,6 @@
#elif defined(XP_DARWIN) #elif defined(XP_DARWIN)
#include "config_darwin64.h" #include "config_darwin64.h"
#elif defined(XP_UNIX) #elif defined(XP_UNIX)
<<<<<<< HEAD
=======
#if defined(__aarch64__) #if defined(__aarch64__)
#include "config_unix_aarch64.h" #include "config_unix_aarch64.h"
#elif defined(__alpha) || defined(__alpha__) #elif defined(__alpha) || defined(__alpha__)
@ -41,7 +39,6 @@
#elif defined(__loongarch64) #elif defined(__loongarch64)
#include "config_unix_loongarch64.h" #include "config_unix_loongarch64.h"
#else #else
>>>>>>> fb438829b5 (MoonchildProductions/UXP#2897: Fix ffvpx build on loongarch64)
#if defined(HAVE_64BIT_BUILD) #if defined(HAVE_64BIT_BUILD)
#include "config_unix64.h" #include "config_unix64.h"
#else #else