--- a/components/desktop/thunderbird/patches/firefox-40-libstagefright.patch	Fri Sep 30 21:33:56 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-Do not use certain header files. We define bswap_16 ourselves.
-Do not plan to send upstream.
-
-diff --git a/media/libstagefright/moz.build b/media/libstagefright/moz.build
---- a/media/libstagefright/moz.build
-+++ b/media/libstagefright/moz.build
-@@ -2,17 +2,17 @@
- # vim: set filetype=python:
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- DEFINES['ANDROID_SMP'] = 0
- DEFINES['LOG_NDEBUG'] = 1
- 
--if CONFIG['OS_TARGET'] != 'WINNT':
-+if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['OS_TARGET'] != 'SunOS':
-    DEFINES['_GLIBCXX_OS_DEFINES'] = True
- 
- if CONFIG['OS_TARGET'] == 'WINNT':
-     if CONFIG['_MSC_VER']:
-         DEFINES['ssize_t'] = 'intptr_t'
-         DEFINES['off64_t'] = 'int64_t'
-         DEFINES['strcasecmp'] = 'stricmp'
-         DEFINES['strncasecmp'] = 'strnicmp'