diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-22 18:49:40 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-22 18:49:40 +0000 |
| commit | 7e6e454565e7a2621b24559da0e2dfdbccb50bb6 (patch) | |
| tree | 044007d10a4a63141888d8b51dd9ea9a1e3c56b1 | |
| parent | 065b9920714ff99c09857c14c2f8dfddc37b0ffd (diff) | |
| download | ports-7e6e454565e7a2621b24559da0e2dfdbccb50bb6.tar.gz ports-7e6e454565e7a2621b24559da0e2dfdbccb50bb6.zip | |
Fix build on Alpha (and probably other 64-bit platforms).
Reported by: bento
Notes
Notes:
svn path=/head/; revision=89110
3 files changed, 114 insertions, 0 deletions
diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp new file mode 100644 index 000000000000..00232c3a3bbf --- /dev/null +++ b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp @@ -0,0 +1,38 @@ +--- src/wp/impexp/xp/ie_exp_HTML.cpp.orig Mon Sep 22 14:46:23 2003 ++++ src/wp/impexp/xp/ie_exp_HTML.cpp Mon Sep 22 14:47:36 2003 +@@ -776,7 +776,7 @@ + void * vptr = 0; + m_tagStack.pop (&vptr); + +- if (reinterpret_cast<UT_uint32>(vptr) == tagID) return; ++ if (reinterpret_cast<unsigned long>(vptr) == tagID) return; + + UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); + } +@@ -820,7 +820,7 @@ + UT_uint32 s_HTML_Listener::tagTop () + { + void * vptr = 0; +- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr); ++ if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<unsigned long>(vptr); + return 0; + } + +@@ -1890,7 +1890,7 @@ + { + void * vptr = 0; + m_utsListType.viewTop (&vptr); +- return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + } + + void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName) +@@ -1929,7 +1929,7 @@ + + void * vptr = 0; + m_utsListType.pop (&vptr); +- UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + + UT_uint32 tagID; + diff --git a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp new file mode 100644 index 000000000000..00232c3a3bbf --- /dev/null +++ b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp @@ -0,0 +1,38 @@ +--- src/wp/impexp/xp/ie_exp_HTML.cpp.orig Mon Sep 22 14:46:23 2003 ++++ src/wp/impexp/xp/ie_exp_HTML.cpp Mon Sep 22 14:47:36 2003 +@@ -776,7 +776,7 @@ + void * vptr = 0; + m_tagStack.pop (&vptr); + +- if (reinterpret_cast<UT_uint32>(vptr) == tagID) return; ++ if (reinterpret_cast<unsigned long>(vptr) == tagID) return; + + UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); + } +@@ -820,7 +820,7 @@ + UT_uint32 s_HTML_Listener::tagTop () + { + void * vptr = 0; +- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr); ++ if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<unsigned long>(vptr); + return 0; + } + +@@ -1890,7 +1890,7 @@ + { + void * vptr = 0; + m_utsListType.viewTop (&vptr); +- return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + } + + void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName) +@@ -1929,7 +1929,7 @@ + + void * vptr = 0; + m_utsListType.pop (&vptr); +- UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + + UT_uint32 tagID; + diff --git a/editors/abiword/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp b/editors/abiword/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp new file mode 100644 index 000000000000..00232c3a3bbf --- /dev/null +++ b/editors/abiword/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp @@ -0,0 +1,38 @@ +--- src/wp/impexp/xp/ie_exp_HTML.cpp.orig Mon Sep 22 14:46:23 2003 ++++ src/wp/impexp/xp/ie_exp_HTML.cpp Mon Sep 22 14:47:36 2003 +@@ -776,7 +776,7 @@ + void * vptr = 0; + m_tagStack.pop (&vptr); + +- if (reinterpret_cast<UT_uint32>(vptr) == tagID) return; ++ if (reinterpret_cast<unsigned long>(vptr) == tagID) return; + + UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); + } +@@ -820,7 +820,7 @@ + UT_uint32 s_HTML_Listener::tagTop () + { + void * vptr = 0; +- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr); ++ if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<unsigned long>(vptr); + return 0; + } + +@@ -1890,7 +1890,7 @@ + { + void * vptr = 0; + m_utsListType.viewTop (&vptr); +- return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + } + + void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName) +@@ -1929,7 +1929,7 @@ + + void * vptr = 0; + m_utsListType.pop (&vptr); +- UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr)); ++ UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr)); + + UT_uint32 tagID; + |