tor-browser

commit b155d5523cd205b7e87fb21ed856710d9101120a
parent f26084f2dfc00c1e10377d4433cfea594f7ea8c2
Author: Andrew Osmond <aosmond@gmail.com>
Date:   Tue, 23 Dec 2025 16:57:13 +0000

Bug 2005122 - Fix duplicate define warnings with ffvpx due to header order inversion. r=media-playback-reviewers,padenot

We always expect config_override.h to be included after
config_components.h, but the order can be changed if we include config.h
first. This patch makes it so that config.h includes config_components.h
instead, which will pull in config_override.h but only after
config_components.h.

Differential Revision: https://phabricator.services.mozilla.com/D275727

Diffstat:
M
media/ffvpx/config.h
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media/ffvpx/config.h b/media/ffvpx/config.h
@@ -68,6 +68,6 @@
 #  endif
 #endif  // else MOZ_FFVPX_AUDIOONLY
         //
-#include "config_override.h"
+#include "config_components.h"
 
 #endif  // MOZ_FFVPX_CONFIG_H