Always link with expat in monolithic build.

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 17b6eb5879c2191e20e90a96d9c1fea88ef84f68..712b38883f1deeb27031b078bd58d9da94a740c2 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -583,8 +583,17 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
 
     // Both POSIX and Single UNIX Specification say that this variable must
     // exist but not that it must be declared anywhere and, indeed, it's not
-    // declared in several common systems (some BSDs, Solaris with native CC).
+    // declared in several common systems (some BSDs, Solaris with native CC)
+    // so we (re)declare it ourselves to deal with these cases. However we do
+    // not do this under MSW where there can be DLL-related complications, i.e.
+    // the variable might be DLL-imported or not. Luckily we don't have to
+    // worry about this as all MSW compilers do seem to define it in their
+    // standard headers anyhow so we can just rely on already having the
+    // correct declaration. And if this turns out to be wrong, we can always
+    // add a configure test checking whether it is declared later.
+#ifndef __WXMSW__
     extern char **environ;
+#endif // !__WXMSW__
 
     char **env = environ;
 #endif
@@ -814,8 +823,8 @@ typedef struct
       smaller partition.  This *guarantees* no more than log (n)
       stack size is needed (actually O(1) in this case)!  */
 
-void wxQsort(void *const pbase, size_t total_elems,
-                             size_t size, CMPFUNCDATA cmp, const void* user_data)
+void wxQsort(void* pbase, size_t total_elems,
+             size_t size, wxSortCallback cmp, const void* user_data)
 {
   register char *base_ptr = (char *) pbase;
   const size_t max_thresh = MAX_THRESH * size;