From 1bfcb0b6c3728b9e3e970c8569cf6405df9ff4f9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Mar 1999 15:23:00 +0000
Subject: [PATCH] some fixes for AIX compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure.in                |  2 +-
 include/wx/motif/checklst.h | 40 ++++++++++++++++++-------------------
 include/wx/string.h         |  9 ++++++---
 src/Makefile.in             |  2 ++
 src/common/socket.cpp       |  6 ++++--
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index 76e9cef27c..3101348993 100644
--- a/configure.in
+++ b/configure.in
@@ -1577,7 +1577,7 @@ case "${canonical}" in
     if test "$GCC" != "yes" ; then
       PICFLAGS="-bM\:SRE"
     else
-      PICFLAGS="-fPIC"
+      PICFLAGS="-fPIC -D__SYSV__"
     fi
     CREATE_SHARED=sharedAIX
     AC_DEFINE(SYSV)
diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index 392737ccc1..554ee2e6e5 100644
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -14,33 +14,33 @@
 #define _WX_CHECKLST_H_
 
 #ifdef __GNUG__
-#pragma interface "checklst.h"
+    #pragma interface "checklst.h"
 #endif
 
 #include "wx/listbox.h"
 
-typedef   unsigned int  size_t;
-
 class wxCheckListBox : public wxListBox
 {
-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+
 public:
-  // ctors
-  wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
-                 const wxString choices[] = NULL,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxListBoxNameStr);
-
-  // items may be checked
-  bool  IsChecked(size_t uiIndex) const;
-  void  Check(size_t uiIndex, bool bCheck = TRUE);
-
-  DECLARE_EVENT_TABLE()
+    // ctors
+    wxCheckListBox();
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   int nStrings = 0, 
+                   const wxString choices[] = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxListBoxNameStr);
+
+    // items may be checked
+    bool IsChecked(size_t uiIndex) const;
+    void Check(size_t uiIndex, bool bCheck = TRUE);
+
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
diff --git a/include/wx/string.h b/include/wx/string.h
index 518b8f5f79..2efa205fe2 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -26,6 +26,10 @@
 #include <limits.h>
 #include <stdlib.h>
 
+#ifdef __AIX__
+    #include <strings.h>    // for strcasecmp()
+#endif // AIX
+
 #ifndef  WX_PRECOMP
   #include "wx/defs.h"
 
@@ -316,9 +320,8 @@ public:
     char& Last()
       { wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; }
 
-    // on alpha-linux this gives overload problems:
-    // Also on Solaris, so removing for now (JACS)
-#if ! defined(__ALPHA__)
+    // on Linux-Alpha and AIX this gives overload problems
+#if !(defined(__ALPHA__) || defined(__AIX__))
     // operator version of GetChar
     char  operator[](size_t n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
diff --git a/src/Makefile.in b/src/Makefile.in
index af01094ec6..4c3b4e17f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -172,10 +172,12 @@ install::
 	@cd $(WXBASEDIR)/src ; \
 	  rm -f $(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 \
 	  echo "  Copying shared library" ; \
 	    rm -f $(libdir)/lib$(LIB_TARGET).so* ; \
 	    $(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 ; \
 	    echo " " ; \
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 4f3b8085e5..cf219b9ea0 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -544,9 +544,11 @@ void wxSocketBase::Discard()
 // switch lines below.
 
 #if wxHAVE_GLIBC2
-#   define wxSOCKET_INT socklen_t
+#   typedef socklen_t wxSOCKET_INT;
+#elif defined(__AIX__)
+#   typedef size_t wxSOCKET_INT;
 #else
-#   define wxSOCKET_INT int
+#   typedef int wxSOCKET_INT;
 #endif
 
 // --------------------------------------------------------------
-- 
2.47.2