mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-14 00:52:35 +02:00
4446f9b14a
abiword fails on musl with loses precision error for code `*pWindowName
= (char) NULL`. This patch fixes it. Patch is taken from Gentoo dev
ernsteiswuerfel [1], also refer [2]
[1]: https://853118.bugs.gentoo.org/attachment.cgi?id=786479
[2]: 857cd86def
Closes: https://bugs.gentoo.org/853118
Signed-off-by: brahmajit das <listout@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26467
Signed-off-by: Sam James <sam@gentoo.org>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
# Patch written by fellow Gentoo user ernsteiswuerfel
|
|
#
|
|
# Please also reffer:
|
|
# https://gitlab.gnome.org/World/AbiWord/-/commit/857cd86def49fe8557cfe123830c4d5a61eee732
|
|
#
|
|
# Closes: https://bugs.gentoo.org/853118
|
|
--- a/src/af/xap/xp/xap_Dialog.cpp
|
|
+++ b/src/af/xap/xp/xap_Dialog.cpp
|
|
@@ -36,8 +36,8 @@
|
|
|
|
XAP_Dialog::XAP_Dialog(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id,
|
|
const char * helpUrl )
|
|
- : m_pApp ( NULL ), m_pDlgFactory ( pDlgFactory ), m_id ( id ),
|
|
- m_helpUrl(NULL)
|
|
+ : m_pApp ( nullptr ), m_pDlgFactory ( pDlgFactory ), m_id ( id ),
|
|
+ m_helpUrl(nullptr)
|
|
{
|
|
m_pApp = pDlgFactory->getApp();
|
|
|
|
@@ -235,7 +235,7 @@ XAP_Frame * XAP_Dialog_Modeless::getActiveFrame(void) const
|
|
// This function returns the frame currently connected to a modeless dialog
|
|
|
|
XAP_Frame * pFrame = m_pApp->getLastFocussedFrame();
|
|
- if(pFrame == (XAP_Frame *) NULL)
|
|
+ if(pFrame == (XAP_Frame *) nullptr)
|
|
{
|
|
pFrame = m_pApp->getFrame(0);
|
|
}
|
|
@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(char * pWindowName, const char * pDialogNam
|
|
// This function constructs and returns the window name of a modeless dialog by
|
|
// concatenating the active frame with the dialog name
|
|
|
|
- *pWindowName = (char) NULL;
|
|
+ *pWindowName = (char) 0;
|
|
UT_UTF8String wn = UT_UTF8String(pDialogName);
|
|
|
|
XAP_Frame* pFrame = getActiveFrame();
|