From be8e60e66d1ab668f0d831b4dec2f0c6dcf9d1f3 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 1 Feb 2024 01:05:58 +0000 Subject: [PATCH] Bug 1876757 - remove qipcap64.dll stub DLL r=mhowell Differential Revision: https://phabricator.services.mozilla.com/D200163 UltraBlame original commit: 2950d0988467c20d2d5bb11edeae1b527dce4057 --- browser/installer/package-manifest.in | 22 -------------- toolkit/library/dummydll/dummydll.cpp | 42 -------------------------- toolkit/library/dummydll/moz.build | 43 --------------------------- toolkit/library/moz.build | 21 ------------- 4 files changed, 128 deletions(-) delete mode 100644 toolkit/library/dummydll/dummydll.cpp delete mode 100644 toolkit/library/dummydll/moz.build diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index f204a56d27276..020d4d01d430d 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -791,28 +791,6 @@ mozavcodec DLL_SUFFIX # endif -# -ifdef -XP_WIN -# -ifdef -_AMD64_ -BINPATH -/ -DLL_PREFIX -qipcap64 -DLL_SUFFIX -# -else -BINPATH -/ -DLL_PREFIX -qipcap -DLL_SUFFIX -# -endif -# -endif ; [ Components diff --git a/toolkit/library/dummydll/dummydll.cpp b/toolkit/library/dummydll/dummydll.cpp deleted file mode 100644 index 78f12e2e742cd..0000000000000 --- a/toolkit/library/dummydll/dummydll.cpp +++ /dev/null @@ -1,42 +0,0 @@ -# -include -< -windows -. -h -> -BOOL -WINAPI -DllMain -( -HANDLE -hModule -DWORD -dwReason -LPVOID -lpvReserved -) -{ -if -( -dwReason -= -= -DLL_PROCESS_ATTACH -) -{ -: -: -DisableThreadLibraryCalls -( -( -HMODULE -) -hModule -) -; -} -return -TRUE -; -} diff --git a/toolkit/library/dummydll/moz.build b/toolkit/library/dummydll/moz.build deleted file mode 100644 index 55e0b2766084f..0000000000000 --- a/toolkit/library/dummydll/moz.build +++ /dev/null @@ -1,43 +0,0 @@ -SOURCES -+ -= -[ -" -dummydll -. -cpp -" -] -if -CONFIG -[ -" -CPU_ARCH -" -] -= -= -" -x86_64 -" -: -GeckoSharedLibrary -( -" -qipcap64 -" -) -else -: -GeckoSharedLibrary -( -" -qipcap -" -) -NoVisibilityFlags -( -) -NO_PGO -= -True diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index bc00be6ca2666..dd95a7ee55b96 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -766,27 +766,6 @@ build gtest " ] -if -CONFIG -[ -" -OS_ARCH -" -] -= -= -" -WINNT -" -: -DIRS -+ -= -[ -" -dummydll -" -] USE_LIBS + =