Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting...

diff --git a/debian/changelog b/debian/changelog
index 138233abf0789d666df0a030d3bae62f3ad2c6dc..7bdb939c972fe318eb81d4cbb5c225ec94fd8407 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ firefox-esr (91.4.0esr-1+rpi1) bookworm-staging; urgency=medium
   * Clean up pycache directories.
   * Disable neon in qcms.
 
+  [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green]
+  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
+    definitions error.
+
  -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 20:12:57 +0000
 
 firefox-esr (91.4.0esr-1) unstable; urgency=medium

diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
index fafd7d6fc1e0d810eb086e21c4663cc81cf55fb3..b5b15f5d75b90d68b655bd6e389f55d342685b0a 100644 (file)
--- a/modules/fdlibm/src/math_private.h
+++ b/modules/fdlibm/src/math_private.h
@@ -35,7 +35,7 @@ typedef long double      __double_t;
 #else
 typedef double      __double_t;
 #endif
-typedef __double_t  double_t;
+#define double_t __double_t
 
 /*
  * The original fdlibm code used statements like: