some fixes for AIX compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1577,7 +1577,7 @@ case "${canonical}" in
|
|||||||
if test "$GCC" != "yes" ; then
|
if test "$GCC" != "yes" ; then
|
||||||
PICFLAGS="-bM\:SRE"
|
PICFLAGS="-bM\:SRE"
|
||||||
else
|
else
|
||||||
PICFLAGS="-fPIC"
|
PICFLAGS="-fPIC -D__SYSV__"
|
||||||
fi
|
fi
|
||||||
CREATE_SHARED=sharedAIX
|
CREATE_SHARED=sharedAIX
|
||||||
AC_DEFINE(SYSV)
|
AC_DEFINE(SYSV)
|
||||||
|
@@ -14,33 +14,33 @@
|
|||||||
#define _WX_CHECKLST_H_
|
#define _WX_CHECKLST_H_
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma interface "checklst.h"
|
#pragma interface "checklst.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/listbox.h"
|
#include "wx/listbox.h"
|
||||||
|
|
||||||
typedef unsigned int size_t;
|
|
||||||
|
|
||||||
class wxCheckListBox : public wxListBox
|
class wxCheckListBox : public wxListBox
|
||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
|
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// ctors
|
// ctors
|
||||||
wxCheckListBox();
|
wxCheckListBox();
|
||||||
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
int nStrings = 0,
|
int nStrings = 0,
|
||||||
const wxString choices[] = NULL,
|
const wxString choices[] = NULL,
|
||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// items may be checked
|
// items may be checked
|
||||||
bool IsChecked(size_t uiIndex) const;
|
bool IsChecked(size_t uiIndex) const;
|
||||||
void Check(size_t uiIndex, bool bCheck = TRUE);
|
void Check(size_t uiIndex, bool bCheck = TRUE);
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
private:
|
||||||
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -26,6 +26,10 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifdef __AIX__
|
||||||
|
#include <strings.h> // for strcasecmp()
|
||||||
|
#endif // AIX
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
@@ -316,9 +320,8 @@ public:
|
|||||||
char& Last()
|
char& Last()
|
||||||
{ wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; }
|
{ wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; }
|
||||||
|
|
||||||
// on alpha-linux this gives overload problems:
|
// on Linux-Alpha and AIX this gives overload problems
|
||||||
// Also on Solaris, so removing for now (JACS)
|
#if !(defined(__ALPHA__) || defined(__AIX__))
|
||||||
#if ! defined(__ALPHA__)
|
|
||||||
// operator version of GetChar
|
// operator version of GetChar
|
||||||
char operator[](size_t n) const
|
char operator[](size_t n) const
|
||||||
{ ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
|
{ ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
|
||||||
|
@@ -172,10 +172,12 @@ install::
|
|||||||
@cd $(WXBASEDIR)/src ; \
|
@cd $(WXBASEDIR)/src ; \
|
||||||
rm -f $(libdir)/$(STATIC_LIBRARY) ; \
|
rm -f $(libdir)/$(STATIC_LIBRARY) ; \
|
||||||
$(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
$(INSTALL_DATA) $(WXBASEDIR)/lib/$(OS)/$(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
|
||||||
|
$(STRIP) $(libdir)/$(STATIC_LIBRARY)
|
||||||
@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
|
@if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
|
||||||
echo " Copying shared library" ; \
|
echo " Copying shared library" ; \
|
||||||
rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
|
rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
|
||||||
$(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
|
$(INSTALL_PROGRAM) $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
|
||||||
|
$(STRIP) $(libdir)/$(SHARED_LIBRARY)
|
||||||
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
|
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
|
||||||
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
|
$(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so ; \
|
||||||
echo " " ; \
|
echo " " ; \
|
||||||
|
@@ -544,9 +544,11 @@ void wxSocketBase::Discard()
|
|||||||
// switch lines below.
|
// switch lines below.
|
||||||
|
|
||||||
#if wxHAVE_GLIBC2
|
#if wxHAVE_GLIBC2
|
||||||
# define wxSOCKET_INT socklen_t
|
# typedef socklen_t wxSOCKET_INT;
|
||||||
|
#elif defined(__AIX__)
|
||||||
|
# typedef size_t wxSOCKET_INT;
|
||||||
#else
|
#else
|
||||||
# define wxSOCKET_INT int
|
# typedef int wxSOCKET_INT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user