Platform and compiler-specific checking for MSW and Mac now done

[wxWidgets.git] / src / html / m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index abd44132e9980c84a4ebfec171386e7c5f71a137..78424023c8c3de243619e1b3d97737f6b07ee2fa 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -84,7 +84,7 @@ private:
 };
 
 // Comparison routine for bsearch into an int* array of pagebreaks.
 };
 
 // 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;
 }
 {
     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),
     // 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)
         {
     // Add a pagebreak only if there isn't one already set here.
     if(NULL != where)
         {