X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e37741247336250f4460714baa43b8136cee3b96..f162a338013ec8be1f2fe29a0111a07cdcb0c5e9:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index abd44132e9..b524a9db1c 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -66,7 +66,7 @@ FORCE_LINK_ME(m_layout) // array wxHtmlPrintout::m_PageBreaks of pagebreaks already set, and // set a new one only if it's not in that array. -class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell +class wxHtmlPageBreakCell : public wxHtmlCell { public: wxHtmlPageBreakCell() {} @@ -84,7 +84,7 @@ private: }; // Comparison routine for bsearch into an int* array of pagebreaks. -static int integer_compare(void const* i0, void const* i1) +extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1) { return *(int*)i0 - *(int*)i1; } @@ -119,7 +119,7 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks, // zero plus one element for each page. int* where = (int*) bsearch(&total_height, known_pagebreaks, 1 + number_of_pages, sizeof(int), - integer_compare); + wxInteger_compare); // Add a pagebreak only if there isn't one already set here. if(NULL != where) {