AIX compilation fixes from Paul Thiessen

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 43dddce6424c8a2600fa8e046f88375246ee6ffe..9c652c91ac3f1df9fe62a5c412a113bccec48a36 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -67,6 +67,8 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
+class WXDLLEXPORT wxDirData;
+
 class WXDLLEXPORT wxDir
 {
 public:

diff --git a/include/wx/list.h b/include/wx/list.h
index e166f1423c339563fdcaf79b00417b5a5c5f59a8..791870083debb26293dd6c292b4f4f2fc009557e 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -131,6 +131,8 @@ private:
 
 WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
 
+class WXDLLEXPORT wxListBase;
+
 class WXDLLEXPORT wxNodeBase
 {
 friend class wxListBase;

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 010481ec0cacc08a63ca2b1e4797cebf6e0a769a..2de6e2e50db9e24c91b29875355d77551ec02589 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -68,6 +68,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
+class WXDLLEXPORT wxPopupWindowHandler;
+class WXDLLEXPORT wxPopupFocusHandler;
+
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:

diff --git a/src/tiff/tiff.h b/src/tiff/tiff.h
index 1904718c008627c79d48532bd36f78ff0798fedf..61d6aa408ee7a839734adbc862a9076433aace72 100644 (file)
--- a/src/tiff/tiff.h
+++ b/src/tiff/tiff.h
@@ -52,19 +52,23 @@
  * 32-bit quantities   int32/uint32
  * strings             unsigned char*
  */
+#ifndef _AIX43 /* int{8,16,32} already defined on AIX */
 #ifdef __STDC__
 typedef        signed char int8;       /* NB: non-ANSI compilers may not grok */
 #else
 typedef        char int8;
 #endif
-typedef        unsigned char uint8;
 typedef        short int16;
+#endif
+typedef        unsigned char uint8;
 typedef        unsigned short uint16;  /* sizeof (uint16) must == 2 */
 #if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
 typedef        int int32;
 typedef        unsigned int uint32;    /* sizeof (uint32) must == 4 */
 #else
+#ifndef _AIX43
 typedef        long int32;
+#endif
 typedef        unsigned long uint32;   /* sizeof (uint32) must == 4 */
 #endif
 #endif /* _TIFF_DATA_TYPEDEFS_ */

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 171918e24ea3c1cd9e1411dd6515080b04de2887..8503131014fa0e52fc2344ead0b789e85a5edb69 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1016,8 +1016,9 @@ long wxGetFreeMemory()
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
+    // the case to "char *" is needed for AIX 4.3
     struct statfs fs;
-    if ( statfs(path, &fs) != 0 )
+    if ( statfs((char *)path.fn_str(), &fs) != 0 )
     {
         wxLogSysError("Failed to get file system statistics");