AIX compilation fixes from Paul Thiessen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5737d05f86
commit
fbfb3fb3c7
@ -67,6 +67,8 @@ public:
|
|||||||
// wxDir: portable equivalent of {open/read/close}dir functions
|
// wxDir: portable equivalent of {open/read/close}dir functions
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
class WXDLLEXPORT wxDirData;
|
||||||
|
|
||||||
class WXDLLEXPORT wxDir
|
class WXDLLEXPORT wxDir
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -131,6 +131,8 @@ private:
|
|||||||
|
|
||||||
WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
|
WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
|
||||||
|
|
||||||
|
class WXDLLEXPORT wxListBase;
|
||||||
|
|
||||||
class WXDLLEXPORT wxNodeBase
|
class WXDLLEXPORT wxNodeBase
|
||||||
{
|
{
|
||||||
friend class wxListBase;
|
friend class wxListBase;
|
||||||
|
@ -68,6 +68,9 @@ public:
|
|||||||
// when the user clicks mouse outside it or if it loses focus in any other way
|
// 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
|
class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -52,19 +52,23 @@
|
|||||||
* 32-bit quantities int32/uint32
|
* 32-bit quantities int32/uint32
|
||||||
* strings unsigned char*
|
* strings unsigned char*
|
||||||
*/
|
*/
|
||||||
|
#ifndef _AIX43 /* int{8,16,32} already defined on AIX */
|
||||||
#ifdef __STDC__
|
#ifdef __STDC__
|
||||||
typedef signed char int8; /* NB: non-ANSI compilers may not grok */
|
typedef signed char int8; /* NB: non-ANSI compilers may not grok */
|
||||||
#else
|
#else
|
||||||
typedef char int8;
|
typedef char int8;
|
||||||
#endif
|
#endif
|
||||||
typedef unsigned char uint8;
|
|
||||||
typedef short int16;
|
typedef short int16;
|
||||||
|
#endif
|
||||||
|
typedef unsigned char uint8;
|
||||||
typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
|
typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
|
||||||
#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
|
#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
|
||||||
typedef int int32;
|
typedef int int32;
|
||||||
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
|
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
|
||||||
#else
|
#else
|
||||||
|
#ifndef _AIX43
|
||||||
typedef long int32;
|
typedef long int32;
|
||||||
|
#endif
|
||||||
typedef unsigned long uint32; /* sizeof (uint32) must == 4 */
|
typedef unsigned long uint32; /* sizeof (uint32) must == 4 */
|
||||||
#endif
|
#endif
|
||||||
#endif /* _TIFF_DATA_TYPEDEFS_ */
|
#endif /* _TIFF_DATA_TYPEDEFS_ */
|
||||||
|
@ -1016,8 +1016,9 @@ long wxGetFreeMemory()
|
|||||||
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
|
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
|
||||||
|
// the case to "char *" is needed for AIX 4.3
|
||||||
struct statfs fs;
|
struct statfs fs;
|
||||||
if ( statfs(path, &fs) != 0 )
|
if ( statfs((char *)path.fn_str(), &fs) != 0 )
|
||||||
{
|
{
|
||||||
wxLogSysError("Failed to get file system statistics");
|
wxLogSysError("Failed to get file system statistics");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user