Ticket #62: boost_1_57_0.diff

boost/asio/detail/config.hpp

@@ -706 +706 @@
 #  elif defined(UNDER_CE)
 #   define BOOST_ASIO_HAS_GETADDRINFO 1
 #  endif // defined(UNDER_CE)
-# elif !(defined(__MACH__) && defined(__APPLE__))
+# elif !(defined(__MACH__) && defined(__APPLE__)) && !defined(__OS2__)
 #  define BOOST_ASIO_HAS_GETADDRINFO 1
 # endif // !(defined(__MACH__) && defined(__APPLE__))
 #endif // !defined(BOOST_ASIO_HAS_GETADDRINFO)

boost/asio/detail/impl/descriptor_ops.ipp

@@ -401 +401 @@
     return -1;
   }
 
+#if defined(__OS2__)
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(d, &fds);
+  int result = error_wrapper(::select(d, &fds, 0, 0, 0), ec);
+#else
   pollfd fds;
   fds.fd = d;
   fds.events = POLLIN;
@@ -408 +414 @@
   int timeout = (state & user_set_non_blocking) ? 0 : -1;
   errno = 0;
   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+#endif
   if (result == 0)
     ec = (state & user_set_non_blocking)
       ? boost::asio::error::would_block : boost::system::error_code();
@@ -424 +431 @@
     return -1;
   }
 
+#if defined(__OS2__)
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(d, &fds);
+  int result = error_wrapper(::select(d, 0, &fds, 0, 0), ec);
+#else
   pollfd fds;
   fds.fd = d;
   fds.events = POLLOUT;
@@ -431 +444 @@
   int timeout = (state & user_set_non_blocking) ? 0 : -1;
   errno = 0;
   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+#endif
   if (result == 0)
     ec = (state & user_set_non_blocking)
       ? boost::asio::error::would_block : boost::system::error_code();

boost/asio/detail/impl/reactive_serial_port_service.ipp

@@ -73 +73 @@
   s = descriptor_ops::error_wrapper(::tcgetattr(fd, &ios), ec);
   if (s >= 0)
   {
-#if defined(_BSD_SOURCE)
+#if defined(_BSD_SOURCE) && !defined(__OS2__)
     ::cfmakeraw(&ios);
 #else
     ios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK

boost/asio/detail/impl/socket_ops.ipp

@@ -92 +92 @@
 inline socket_type call_accept(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
+#if defined(__OS2__)
+  int tmp_addrlen = addrlen ? (int)*addrlen : 0;
+#else
   SockLenType tmp_addrlen = addrlen ? (SockLenType)*addrlen : 0;
+#endif
   socket_type result = ::accept(s, addr, addrlen ? &tmp_addrlen : 0);
   if (addrlen)
     *addrlen = (std::size_t)tmp_addrlen;
@@ -1491 +1495 @@
     socket_type s, int level, int optname,
     void* optval, std::size_t* optlen)
 {
+#if defined(__OS2__)
+  int tmp_optlen = (int)*optlen;
+#else
   SockLenType tmp_optlen = (SockLenType)*optlen;
+#endif
   int result = ::getsockopt(s, level, optname, (char*)optval, &tmp_optlen);
   *optlen = (std::size_t)tmp_optlen;
   return result;
@@ -1600 +1608 @@
 inline int call_getpeername(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
+#if defined(__OS2__)
+  int tmp_addrlen = (int)*addrlen;
+#else
   SockLenType tmp_addrlen = (SockLenType)*addrlen;
+#endif
   int result = ::getpeername(s, addr, &tmp_addrlen);
   *addrlen = (std::size_t)tmp_addrlen;
   return result;
@@ -1652 +1664 @@
 inline int call_getsockname(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
+#if defined(__OS2__)
+  int tmp_addrlen = (int)*addrlen;
+#else
   SockLenType tmp_addrlen = (SockLenType)*addrlen;
+#endif
   int result = ::getsockname(s, addr, &tmp_addrlen);
   *addrlen = (std::size_t)tmp_addrlen;
   return result;
@@ -1748 +1764 @@
     timeout->tv_usec = 1000;
 #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
 
+#if defined(__OS2__)
+  // The select() call allows timeout values measured in microseconds, but the
+  // system clock (as wrapped by boost::posix_time::microsec_clock) typically
+  // has a resolution of 10 milliseconds. This can lead to a spinning select
+  // reactor, meaning increased CPU usage, when waiting for the earliest
+  // scheduled timeout if it's less than 10 milliseconds away. To avoid a tight
+  // spin we'll use a minimum timeout of 1 millisecond.
+  if (timeout && timeout->tv_sec == 0
+      && timeout->tv_usec > 0 && timeout->tv_usec < 1000)
+    timeout->tv_usec = 1000;
+#endif
+
 #if defined(__hpux) && defined(__SELECT)
   timespec ts;
   ts.tv_sec = timeout ? timeout->tv_sec : 0;
@@ -1773 +1801 @@
 
 #if defined(BOOST_ASIO_WINDOWS) \
   || defined(__CYGWIN__) \
+  || defined(__OS2__) \
   || defined(__SYMBIAN32__)
+#if defined(__OS2__)
+  fd_set fds;
+#else
   fd_set fds;
+#endif
   FD_ZERO(&fds);
   FD_SET(s, &fds);
   timeval zero_timeout;
@@ -1814 +1847 @@
 
 #if defined(BOOST_ASIO_WINDOWS) \
   || defined(__CYGWIN__) \
+  || defined(__OS2__) \
   || defined(__SYMBIAN32__)
   fd_set fds;
   FD_ZERO(&fds);
@@ -1855 +1889 @@
 
 #if defined(BOOST_ASIO_WINDOWS) \
   || defined(__CYGWIN__) \
+  || defined(__OS2__) \
   || defined(__SYMBIAN32__)
   fd_set write_fds;
   FD_ZERO(&write_fds);
@@ -1986 +2021 @@
         af, src, dest, static_cast<int>(length)), ec);
   if (result == 0 && !ec)
     ec = boost::asio::error::invalid_argument;
+#ifndef __OS2__
   if (result != 0 && af == BOOST_ASIO_OS_DEF(AF_INET6) && scope_id != 0)
   {
     using namespace std; // For strcat and sprintf.
@@ -2000 +2036 @@
       sprintf(if_name + 1, "%lu", scope_id);
     strcat(dest, if_name);
   }
+#endif
   return result;
 #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
 }
@@ -2216 +2253 @@
   int result = error_wrapper(::inet_pton(af, src, dest), ec);
   if (result <= 0 && !ec)
     ec = boost::asio::error::invalid_argument;
+#ifndef __OS2__
   if (result > 0 && af == BOOST_ASIO_OS_DEF(AF_INET6) && scope_id)
   {
     using namespace std; // For strchr and atoi.
@@ -2233 +2271 @@
         *scope_id = atoi(if_name + 1);
     }
   }
+#endif
   return result;
 #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
 }
@@ -2282 +2321 @@
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
 #if !defined(BOOST_ASIO_HAS_GETADDRINFO)
-
 // The following functions are only needed for emulation of getaddrinfo and
 // getnameinfo.
 
@@ -2310 +2348 @@
     hostent* result, char* buffer, int buflength, boost::system::error_code& ec)
 {
   clear_last_error();
-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__OS2__)
   (void)(buffer);
   (void)(buflength);
   hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec);
@@ -2353 +2391 @@
     char* buffer, int buflength, int ai_flags, boost::system::error_code& ec)
 {
   clear_last_error();
-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__OS2__)
   (void)(buffer);
   (void)(buflength);
   (void)(ai_flags);

boost/asio/detail/impl/socket_select_interrupter.ipp

@@ -21 +21 @@
 
 #if defined(BOOST_ASIO_WINDOWS) \
   || defined(__CYGWIN__) \
+  || defined(__OS2__) \
   || defined(__SYMBIAN32__)
 
 #include <cstdlib>

boost/asio/detail/old_win_sdk_compat.hpp

@@ -17 +17 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__OS2__)
 
 // Guess whether we are building against on old Platform SDK.
 #if !defined(IN6ADDR_ANY_INIT)
@@ -25 +25 @@
 #endif // !defined(IN6ADDR_ANY_INIT)
 
 #if defined(BOOST_ASIO_HAS_OLD_WIN_SDK)
-
+#if defined(__OS2__)
+#define __int64 __int64_t
+#endif
 // Emulation of types that are missing from old Platform SDKs.
 //
 // N.B. this emulation is also used if building for a Windows 2000 target with

boost/asio/detail/select_interrupter.hpp

@@ -19 +19 @@
 
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
+#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) || defined(__OS2__)
 # include <boost/asio/detail/socket_select_interrupter.hpp>
 #elif defined(BOOST_ASIO_HAS_EVENTFD)
 # include <boost/asio/detail/eventfd_select_interrupter.hpp>
@@ -31 +31 @@
 namespace asio {
 namespace detail {
 
-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
+#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) || defined(__OS2__)
 typedef socket_select_interrupter select_interrupter;
 #elif defined(BOOST_ASIO_HAS_EVENTFD)
 typedef eventfd_select_interrupter select_interrupter;

boost/asio/detail/socket_ops.hpp

@@ -24 +24 @@
 
 #include <boost/asio/detail/push_options.hpp>
 
+#if defined(BOOST_HAS_THREADS) && defined(BOOST_HAS_PTHREADS)
+#include <pthread.h>
+#endif
+
 namespace boost {
 namespace asio {
 namespace detail {

boost/asio/detail/socket_select_interrupter.hpp

@@ -21 +21 @@
 
 #if defined(BOOST_ASIO_WINDOWS) \
   || defined(__CYGWIN__) \
-  || defined(__SYMBIAN32__)
+  || defined(__SYMBIAN32__) \
+  || defined(__OS2__)
 
 #include <boost/asio/detail/socket_types.hpp>
 

boost/asio/detail/socket_types.hpp

@@ -82 +82 @@
 # endif
 #endif
 
+#if defined(__OS2__)
+#include <boost/asio/detail/old_win_sdk_compat.hpp>
+#endif
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
@@ -279 +282 @@
 const int invalid_socket = -1;
 const int socket_error_retval = -1;
 const int max_addr_v4_str_len = INET_ADDRSTRLEN;
+#if defined(__OS2__)
+#define SHUT_RD 0
+#define SHUT_WR 1
+#define SHUT_RDWR 2
+# if defined(BOOST_ASIO_HAS_OLD_WIN_SDK)
+typedef in6_addr_emulation in6_addr_type;
+typedef ipv6_mreq_emulation in6_mreq_type;
+typedef sockaddr_in6_emulation sockaddr_in6_type;
+typedef sockaddr_storage_emulation sockaddr_storage_type;
+typedef addrinfo_emulation addrinfo_type;
+# endif
+#endif
 #if defined(INET6_ADDRSTRLEN)
 const int max_addr_v6_str_len = INET6_ADDRSTRLEN + 1 + IF_NAMESIZE;
 #else // defined(INET6_ADDRSTRLEN)
@@ -297 +312 @@
 typedef ip_mreq in4_mreq_type;
 # endif
 typedef sockaddr_in sockaddr_in4_type;
+#if !defined(__OS2__)
 typedef in6_addr in6_addr_type;
 typedef ipv6_mreq in6_mreq_type;
 typedef sockaddr_in6 sockaddr_in6_type;
 typedef sockaddr_storage sockaddr_storage_type;
+#endif
 typedef sockaddr_un sockaddr_un_type;
+#if !defined(__OS2__)
 typedef addrinfo addrinfo_type;
+#endif
 typedef ::linger linger_type;
 typedef int ioctl_arg_type;
 typedef uint32_t u_long_type;

boost/asio/impl/serial_port_base.ipp

@@ -250 +250 @@
   {
   case none:
     storage.c_iflag &= ~(IXOFF | IXON);
-# if defined(_BSD_SOURCE)
+# if defined(_BSD_SOURCE) && !defined(__OS2__)
     storage.c_cflag &= ~CRTSCTS;
 # elif defined(__QNXNTO__)
     storage.c_cflag &= ~(IHFLOW | OHFLOW);
@@ -258 +258 @@
     break;
   case software:
     storage.c_iflag |= IXOFF | IXON;
-# if defined(_BSD_SOURCE)
+# if defined(_BSD_SOURCE) && !defined(__OS2__)
     storage.c_cflag &= ~CRTSCTS;
 # elif defined(__QNXNTO__)
     storage.c_cflag &= ~(IHFLOW | OHFLOW);
@@ -267 +267 @@
   case hardware:
 # if defined(_BSD_SOURCE)
     storage.c_iflag &= ~(IXOFF | IXON);
+#if !defined(__OS2__)
     storage.c_cflag |= CRTSCTS;
+#endif
     break;
 # elif defined(__QNXNTO__)
     storage.c_iflag &= ~(IXOFF | IXON);
@@ -306 +308 @@
   {
     value_ = software;
   }
-# if defined(_BSD_SOURCE)
+# if defined(_BSD_SOURCE) && !defined(__OS2__)
   else if (storage.c_cflag & CRTSCTS)
   {
     value_ = hardware;

boost/chrono/detail/inlined/posix/thread_clock.hpp

@@ -33 +33 @@
         pthread_t pth=pthread_self();
         // get the clock_id associated to the current thread
         clockid_t clock_id;
+#ifndef __OS2__
         pthread_getcpuclockid(pth, &clock_id);
+#endif
         // get the timespec associated to the thread clock
         if ( ::clock_gettime( clock_id, &ts ) )
 #endif
@@ -59 +61 @@
         pthread_t pth=pthread_self();
         // get the clock_id associated to the current thread
         clockid_t clock_id;
+#ifndef __OS2__
         pthread_getcpuclockid(pth, &clock_id);
+#endif
         // get the timespec associated to the thread clock
         if ( ::clock_gettime( clock_id, &ts ) )
 #endif

boost/chrono/system_clocks.hpp

@@ -67 +67 @@
 #include <ctime>
 
 # if defined( BOOST_CHRONO_POSIX_API )
-#   if ! defined(CLOCK_REALTIME) && ! defined (__hpux__)
+#   if ! defined(CLOCK_REALTIME) && ! defined (__hpux__) && !defined(__OS2__)
 #     error <time.h> does not supply CLOCK_REALTIME
 #   endif
 # endif

boost/config/select_platform_config.hpp

@@ -45 +45 @@
 // BeOS
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"
 
+#elif defined(__OS2__)
+// BeOS
+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/os2.hpp"
+
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
 // MacOS
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/macos.hpp"
@@ -113 +117 @@
 #  include "boost/config/platform/cygwin.hpp"
 #  include "boost/config/platform/win32.hpp"
 #  include "boost/config/platform/beos.hpp"
+#  include "boost/config/platform/os2.hpp"
 #  include "boost/config/platform/macos.hpp"
 #  include "boost/config/platform/aix.hpp"
 #  include "boost/config/platform/amigaos.hpp"

boost/config/stdlib/libstdcpp3.hpp

@@ -17 +17 @@
 #define BOOST_STDLIB "GNU libstdc++ version " BOOST_STRINGIZE(__GLIBCPP__)
 #endif
 
-#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T)
+#if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T) && !defined(__OS2__)
 #  define BOOST_NO_CWCHAR
 #  define BOOST_NO_CWCTYPE
 #  define BOOST_NO_STD_WSTRING
@@ -36 +36 @@
         || defined(_GLIBCXX__PTHREADS) \
         || defined(_GLIBCXX_HAS_GTHREADS) \
         || defined(_WIN32) \
+        || defined(__OS2__) \
         || defined(_AIX)
       //
       // If the std lib has thread support turned on, then turn it on in Boost

boost/config/suffix.hpp

@@ -247 +247 @@
 // from here then add to the appropriate compiler section):
 //
 #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
-    || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) \
+    || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__) || defined(__OS2__))\
     && !defined(BOOST_HAS_THREADS)
 #  define BOOST_HAS_THREADS
 #endif

boost/filesystem/config.hpp

@@ -45 +45 @@
 
 #define BOOST_FILESYSTEM_THROW(EX) throw EX
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/filesystem/convenience.hpp

@@ -15 +15 @@
 
 #include <boost/config.hpp>
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/filesystem/fstream.hpp

@@ -14 +14 @@
 
 #include <boost/config.hpp>
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/filesystem/operations.hpp

@@ -17 +17 @@
 
 #include <boost/config.hpp>
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/filesystem/path_traits.hpp

@@ -12 +12 @@
 
 #include <boost/config.hpp>
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/filesystem/path.hpp

@@ -17 +17 @@
 
 #include <boost/config.hpp>
 
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

boost/integer_traits.hpp

@@ -23 +23 @@
 #include <limits.h>
 // we need wchar.h for WCHAR_MAX/MIN but not all platforms provide it,
 // and some may have <wchar.h> but not <cwchar> ...
-#if !defined(BOOST_NO_INTRINSIC_WCHAR_T) && (!defined(BOOST_NO_CWCHAR) || defined(sun) || defined(__sun) || defined(__QNX__))
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T) && (!defined(BOOST_NO_CWCHAR) || defined(sun) || defined(__sun) || defined(__QNX__) || defined(__OS2__))
 #include <wchar.h>
 #endif
 

boost/lexical_cast/detail/converter_lexical_streams.hpp

@@ -316 +316 @@
 #endif
 
 
-#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_SWPRINTF) && !defined(__MINGW32__)
+#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_SWPRINTF) && !defined(__MINGW32__) && !defined(__OS2__)
             bool shl_real_type(float val, wchar_t* begin) {
                 using namespace std;
                 const double val_as_double = val;

boost/smart_ptr/detail/sp_has_sync.hpp

@@ -38 +38 @@
 #undef BOOST_SP_HAS_SYNC
 #endif
 
+#if defined( __OS2__ )
+#undef BOOST_SP_HAS_SYNC
+#endif
+
 #if defined( __hppa ) || defined( __hppa__ )
 #undef BOOST_SP_HAS_SYNC
 #endif

boost/smart_ptr/detail/yield_k.hpp

@@ -98 +98 @@
 
 #elif defined( BOOST_HAS_PTHREADS )
 
+#ifndef __OS2__
 #ifndef _AIX
 #include <sched.h>
 #else
    // AIX's sched.h defines ::var which sometimes conflicts with Lambda's var
        extern "C" int sched_yield(void);
 #endif
-
+#endif
 #include <time.h>
 
 namespace boost
@@ -126 +127 @@
 #endif
     else if( k < 32 || k & 1 )
     {
+#ifndef __OS2__
         sched_yield();
+#endif
     }
     else
     {

boost/thread/pthread/timespec.hpp

@@ -20 +20 @@
 #include <boost/chrono/duration.hpp>
 #endif
 
-#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__OS2__)
 #     define BOOST_THREAD_TIMESPEC_MAC_API
 #include <sys/time.h> //for gettimeofday and timeval
 #else

boost/token_functions.hpp

@@ -67 +67 @@
 namespace std{
  using ::ispunct;
  using ::isspace;
-#if !defined(BOOST_NO_CWCTYPE)
+#if !defined(BOOST_NO_CWCTYPE) && !defined(__OS2__)
  using ::iswpunct;
  using ::iswspace;
 #endif
@@ -210 +210 @@
   // implementations, argument types are not a problem since both forms of character classifiers
   // expect an int.
 
-#if !defined(BOOST_NO_CWCTYPE)
+#if !defined(BOOST_NO_CWCTYPE) && !defined(__OS2__)
   template<typename traits, int N>
   struct traits_extension_details : public traits {
     typedef typename traits::char_type char_type;

boost/wave/token_ids.hpp

@@ -27 +27 @@
 #if !defined(BOOST_WAVE_TOKEN_IDS_DEFINED)
 #define BOOST_WAVE_TOKEN_IDS_DEFINED
 
-#if (defined (__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__)) && defined (T_DIVIDE) 
+#if (defined (__FreeBSD__) || defined (__DragonFly__) || defined(__OS2__) || defined (__OpenBSD__)) && defined (T_DIVIDE) 
 #undef T_DIVIDE
 #endif
 

bootstrap.sh

@@ -26 +26 @@
 flag_icu=
 flag_show_libraries=
 
+# Check that the OS name, as returned by "uname", is as given.
+test_uname ()
+{
+    test `uname` = $*
+}
+
 for option
 do
     case $option in
@@ -226 +232 @@
   arch=`cd $my_dir/tools/build/src/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
   BJAM="$my_dir/tools/build/src/engine/$arch/b2"
   echo "tools/build/src/engine/$arch/b2"
+  if test_uname OS/2 ; then
+  cp "$BJAM.exe" .
+  else
   cp "$BJAM" .
+  fi
   cp "$my_dir/tools/build/src/engine/$arch/bjam" .
 
 fi

libs/container/src/dlmalloc_2_8_6.c

@@ -565 +565 @@
 #endif /*MMAP_CLEARS */
 #endif  /* WIN32 */
 
+#ifdef __OS2__
+#define LACKS_SCHED_H
+#endif
+
 #if defined(DARWIN) || defined(_DARWIN)
 /* Mac OSX docs advise not to use sbrk; it seems better to use mmap */
 #ifndef HAVE_MORECORE

libs/filesystem/src/path.cpp

@@ -10 +10 @@
 //  Old standard library configurations, particularly MingGW, don't support wide strings.
 //  Report this with an explicit error message.
 #include <boost/config.hpp>
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

libs/filesystem/test/convenience_test.cpp

@@ -21 +21 @@
 #include <boost/filesystem/convenience.hpp>
 
 #include <boost/config.hpp>
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

libs/filesystem/test/deprecated_test.cpp

@@ -16 +16 @@
 #include <boost/filesystem.hpp>
 
 #include <boost/config.hpp>
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

libs/filesystem/test/fstream_test.cpp

@@ -20 +20 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <boost/config.hpp>
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

libs/filesystem/test/issues/recurse_dir_iter_5403.cpp

@@ -20 +20 @@
 #include <boost/filesystem/operations.hpp>
 
 #include <boost/config.hpp>
-# if defined( BOOST_NO_STD_WSTRING )
+# if defined( BOOST_NO_STD_WSTRING ) && !defined(__OS2__)
 #   error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 

tools/build/src/build/type.jam

@@ -354 +354 @@
 #
 rule type ( filename )
 {
-    if [ os.name ] in NT CYGWIN
+    if [ os.name ] in NT CYGWIN OS2
     {
         filename = $(filename:L) ;
     }

tools/build/src/build-system.jam

@@ -334 +334 @@
 
     local user-path = [ os.home-directories ] [ os.environ BOOST_BUILD_PATH ] ;
     local site-path = /etc $(user-path) ;
-    if [ os.name ] in NT CYGWIN
+    if [ os.name ] in NT CYGWIN OS2
     {
         site-path = [ modules.peek : SystemRoot ] $(user-path) ;
     }

tools/build/src/engine/build.jam

@@ -572 +572 @@
 if $(OS) = NT { actions piecemeal together existing [DELETE] {
     del /F /Q "$(>)"
 } }
+if $(OS) = OS2 { actions piecemeal together existing [DELETE] {
+    rm -f "$(>)"
+} }
 if $(UNIX) = true { actions piecemeal together existing [DELETE] {
     rm -f "$(>)"
 } }
@@ -591 +594 @@
 if $(OS) = NT { actions [MKDIR] {
     md "$(<)"
 } }
+if $(OS2) = true { actions [MKDIR] {
+    md "$(<)"
+} }
 if $(UNIX) = true { actions [MKDIR] {
     mkdir "$(<)"
 } }

tools/build/src/engine/build.sh

@@ -130 +130 @@
     ;;
 
     gcc)
+    if test_uname OS/2 ; then
+    BOOST_JAM_OPT_JAM="-Zomf $BOOST_JAM_OPT_JAM -D__OS2__ -D__EMX__"
+    fi
     BOOST_JAM_CC=gcc
     ;;
 
@@ -258 +261 @@
     ;;
 
     *)
+#    if test_uname OS/2 ; then
+#    BJAM_SOURCES="${BJAM_SOURCES} execos2.c fileunix.c pathunix.c"
+#    else
     BJAM_SOURCES="${BJAM_SOURCES} execunix.c fileunix.c pathunix.c"
+#    fi
     ;;
 esac
 

tools/build/src/engine/builtins.c

@@ -726 +726 @@
     globbing.patterns = r;
 
     globbing.case_insensitive =
-# if defined( OS_NT ) || defined( OS_CYGWIN )
+# if defined( OS_NT ) || defined( OS_CYGWIN ) || defined( OS_OS2 )
        l;  /* Always case-insensitive if any files can be found. */
 # else
        lol_get( frame->args, 2 );
@@ -774 +774 @@
     globbing.patterns = plist;
 
     globbing.case_insensitive
-# if defined( OS_NT ) || defined( OS_CYGWIN )
+# if defined( OS_NT ) || defined( OS_CYGWIN ) || defined( OS_OS2 )
        = plist;  /* always case-insensitive if any files can be found */
 # else
        = L0;

tools/build/src/engine/execunix.c

@@ -21 +21 @@
 #include <sys/times.h>
 #include <sys/wait.h>
 
+#ifdef __OS2__
+#include <sys/socket.h>
+#endif
+
 #if defined(sun) || defined(__sun)
     #include <wait.h>
 #endif
 
 #ifdef USE_EXECUNIX
-
 #include <sys/times.h>
 
 #if defined(__APPLE__)
@@ -169 +172 @@
     }
 
     /* Create pipes for collecting child output. */
+#ifndef __OS2__
     if ( pipe( out ) < 0 || ( globs.pipe_action && pipe( err ) < 0 ) )
+#else
+    if ( socketpair(AF_UNIX, SOCK_STREAM,0,  out ) < 0 || ( globs.pipe_action && pipe( err ) < 0 ) )
+#endif
     {
         perror( "pipe" );
         exit( EXITBAD );

tools/build/src/engine/jam.h

@@ -98 +98 @@
 
 
 /*
+ * OS2
+ */
+
+#ifdef __OS2__
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <malloc.h>
+#include <signal.h>
+#include <string.h>
+#include <time.h>
+
+#define OSMAJOR "OS2=true"
+#define OSMINOR "OS=OS2"
+#define OS_OS2
+#define SPLITPATH ';'
+#define MAXLINE 996    /* longest 'together' actions */
+/*#define USE_EXECOS2*/
+#define USE_EXECUNIX
+#define USE_PATHUNIX
+#define PATH_DELIM '\\'
+#define DOWNSHIFT_PATHS
+
+#define NO_VFORK
+
+#ifdef __EMX__
+    #define USE_FILEUNIX
+#endif
+
+#endif
+
+/*
  * God fearing UNIX.
  */
 

tools/build/src/engine/pathunix.c

@@ -22 +22 @@
 #include <unistd.h>  /* needed for getpid() */
 
 
+#ifdef OS_OS2
+char* short_path_to_long_path(char* short_path)  /* converts any "/" to "\" */
+{
+
+    int i = 0;
+    int len = 0;
+    len = strlen(short_path);
+    for (i=0;i<len;++i) {
+        if (short_path[i] == '/')
+           short_path[i] = '\\';
+    }
+    return short_path;
+}
+#endif
+
 /*
  * path_get_process_id_()
  */
@@ -39 +54 @@
 void path_get_temp_path_( string * buffer )
 {
     char const * t = getenv( "TMPDIR" );
+#ifdef OS_OS2
+        if (!t)
+        {
+           const char * t = getenv("TEMP");
+        }
+#endif
     string_append( buffer, t ? t : "/tmp" );
 }
 

tools/build/src/tools/builtin.jam

@@ -41 +41 @@
 
 
 .os-names = aix android bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf
-    qnx qnxnto sgi solaris unix unixware windows
+    qnx qnxnto sgi solaris unix unixware windows os2
     elf  # Not actually an OS -- used for targeting bare metal where object
          # format is ELF.  This catches both -elf and -eabi gcc targets and well
          # as other compilers targeting ELF. It is not clear how often we need

tools/build/src/tools/common.jam

@@ -383 +383 @@
             # Only NT will run .bat & .cmd files by their unqualified names.
             || ( ( [ os.name ] = NT ) && ( [ path.exists $(command).bat ] ||
                 [ path.exists $(command).cmd ] ) )
+            || ( ( [ os.name ] = OS2 ) && ( [ path.exists $(command).bat ] ||
+                [ path.exists $(command).cmd ] || [ path.exists $(command).exe ] ) )
+
         {
             return $(command) ;
         }
@@ -521 +524 @@
 #
 rule variable-setting-command ( variable : value )
 {
-    if [ os.name ] = NT
+    if [ os.name ] = NT || [ os.name ] = OS2
     {
         return "set $(variable)=$(value)$(nl)" ;
     }
@@ -629 +632 @@
         # recurse until root.
 
         local s = $(<:P) ;
-        if [ os.name ] = NT
+        if [ os.name ] = NT || [ os.name ] = OS2
         {
             switch $(s)
             {
@@ -664 +667 @@
 # up to the same filesystem target and triggers their build action only once.
 #                                             (todo) (04.07.2008.) (Jurko)
 
-if [ os.name ] = NT
+if [ os.name ] = NT || [ os.name ] = OS2
 {
     actions mkdir
     {

tools/build/src/tools/gcc.jam

@@ -47 +47 @@
 type.set-generated-target-suffix OBJ : <toolset>gcc : o ;
 type.set-generated-target-suffix OBJ : <toolset>gcc <target-os>windows : o ;
 type.set-generated-target-suffix OBJ : <toolset>gcc <target-os>cygwin : o ;
+type.set-generated-target-suffix OBJ : <toolset>gcc <target-os>os2 : o ;
 
 
 # Initializes the gcc toolset for the given version. If necessary, command may
@@ -201 +202 @@
             case HPUX    : linker = hpux ;
             case AIX     : linker = aix ;
             case SOLARIS : linker = sun ;
+            case OS2     : linker = os2 ;
             case *       : linker = gnu ;
         }
     }
@@ -412 +414 @@
 
         # On Windows, fPIC is the default, and specifying -fPIC explicitly leads
         # to a warning.
-        if ! $(target) in cygwin windows
+        if ! $(target) in cygwin windows os2
         {
             OPTIONS on $(targets) += -fPIC ;
         }
@@ -471 +473 @@
 
 
 # FIXME: this should not use os.name.
-if ! [ os.name ] in NT OSF HPUX AIX
+if ! [ os.name ] in NT OSF HPUX AIX OS2
 {
     # OSF does have an option called -soname but it does not seem to work as
     # expected, therefore it has been disabled.
@@ -802 +804 @@
         toolset.flags $(toolset).link OPTIONS : -Wl,-brtl -Wl,-bnoipath -Wl,-bbigtoc
             : unchecked ;
 
+    case os2 :
+        {
+        # on os2 we use native linker
+        toolset.flags $(toolset).link OPTIONS : -Zomf : unchecked ;
+        toolset.flags $(toolset).link.dll OPTIONS : -Zdll -Zomf : unchecked ;
+        }
+
     case darwin :
         # On Darwin, the -s option to ld does not work unless we pass -static,
         # and passing -static unconditionally is a bad idea. So, do not pass -s
@@ -1037 +1046 @@
             case *bsd    : option = -pthread ;  # There is no -lrt on BSD.
             case sgi     : # gcc on IRIX does not support multi-threading.
             case darwin  : # No threading options.
+            case os2     : # not available right now
             case *       : option = -pthread ; libs = rt ;
         }
 

tools/build/src/tools/python.jam

@@ -324 +324 @@
     {
         path = [ cygwin-to-windows-path $(path) ] ;
     }
+    else if [ os.name ] = OS2
+    {
+        return path.native $(path) ;
+    }
     return $(path) ;
 }
 
@@ -506 +510 @@
 {
     exec-prefix ?= $(prefix) ;
 
-    if $(target-os) = windows
+    if $(target-os) = windows || $(target-os) = OS2
     {
         # The exec_prefix is where you're supposed to look for machine-specific
         # libraries.
@@ -587 +591 @@
         # Search relative to the prefix, or if none supplied, in PATH.
         local unversioned = $(:E=python:R=$(bin-path:E=)) ;
 
+    if $(target-os) = os2
+    {
+        return $(:E=python:R=$(prefix)) $(unversioned) $(unversioned)$(version) ;
+    }
+    else
+    { 
         # If a version was specified, look for a python with that specific
         # version appended before looking for one called, simply, "python"
         return $(unversioned)$(version) $(unversioned) ;
     }
+    }
 }
 
 
@@ -639 +650 @@
         case qnx* : return ;
         case darwin : return ;
         case windows : return ;
+        case os2 : return ;
 
         case hpux : return  <library>rt ;
         case *bsd : return  <library>pthread <toolset>gcc:<library>util ;
@@ -874 +886 @@
     local dll-path = $(libraries) ;
 
     # Make sure that we can find the Python DLL on Windows.
-    if ( $(target-os) = windows ) && $(exec-prefix)
+    if ( $(target-os) = windows || $(target-os) = os2 ) && $(exec-prefix)
     {
         dll-path += $(exec-prefix) ;
     }

tools/build/src/tools/symlink.jam

@@ -137 +137 @@
     copy "$(>)" "$(<)" $(NULL_OUT)
 }
 
+actions ln-OS2
+{
+    copy "$(>)" "$(<)" $(NULL_OUT)
+}
+
 IMPORT $(__name__) : symlink : : symlink ;

tools/build/src/tools/types/exe.jam

@@ -7 +7 @@
 type.register EXE ;
 type.set-generated-target-suffix EXE : <target-os>windows : "exe" ;
 type.set-generated-target-suffix EXE : <target-os>cygwin : "exe" ;
+type.set-generated-target-suffix EXE : <target-os>os2 : "exe" ;

tools/build/src/tools/types/lib.jam

@@ -34 +34 @@
 
 # The 'lib' prefix is used everywhere
 type.set-generated-target-prefix STATIC_LIB : : lib ;
+type.set-generated-target-prefix STATIC_LIB : <target-os>os2 : "" ;
 
 # Use '.lib' suffix for windows
 type.set-generated-target-suffix STATIC_LIB : <target-os>windows : lib ;
+type.set-generated-target-suffix STATIC_LIB : <target-os>os2    : a ;
 
 # Except with gcc.
 type.set-generated-target-suffix STATIC_LIB : <toolset>gcc <target-os>windows : a ;
@@ -66 +68 @@
 type.set-generated-target-suffix SHARED_LIB : <target-os>windows : dll ;
 type.set-generated-target-suffix SHARED_LIB : <target-os>cygwin : dll ;
 type.set-generated-target-suffix SHARED_LIB : <target-os>darwin : dylib ;
+type.set-generated-target-suffix SHARED_LIB : <target-os>os2    : dll ;
 
 type SEARCHED_LIB : : LIB ;
 # This is needed so that when we create a target of SEARCHED_LIB

tools/build/src/tools/types/register.jam

@@ -21 +21 @@
 }
 
 .this-module's-file = [ modules.binding $(__name__) ] ;
+if ! [os.name] = OS2
+{
 .this-module's-dir = [ path.parent $(.this-module's-file) ] ;
+}
+# on os2 we need to normalize the path also. 
+else
+{
+.this-module's-dir = [ path.make $(.this-module's-file) ] ;
+.this-module's-dir = [ path.parent $(.this-module's-dir) ] ;
+}
+
 .sibling-jamfiles =  [ path.glob $(.this-module's-dir) : *.jam ] ;
 .sibling-modules = [ MATCH ^(.*)\.jam$ : $(.sibling-jamfiles) ] ;
 

tools/build/src/util/os.jam

@@ -68 +68 @@
 .expand-variable-prefix-NT = % ;
 .expand-variable-suffix-NT = % ;
 .executable-suffix-NT = .exe ;
+.executable-suffix-OS2 = .exe ;
+.path-separator-OS2 = ";" ;
+.expand-variable-prefix-OS2 = % ;
+.expand-variable-suffix-OS2 = % ;
 
 .shared-library-path-variable-CYGWIN = PATH ;
 

tools/build/src/util/path.jam

@@ -502 +502 @@
 }
 
 
+rule make-OS2 ( native )
+{
+    local result ;
+
+        result = [ NORMALIZE_PATH $(native) ] ;
+
+    # We need to add an extra '/' in front in case this is a rooted Windows path
+    # starting with a drive letter and not a path separator character since the
+    # builtin NORMALIZE_PATH rule has no knowledge of this leading drive letter
+    # and treats it as a regular folder name.
+    if [ regex.match "(^.:)" : $(native) ]
+    {
+        result = /$(result) ;
+    }
+
+    return $(result) ;
+}
+
+
+rule native-OS2 ( path )
+{
+    local result ;
+    if [ is-rooted $(path) ] && ! [ regex.match "^/(.:)" : $(path) ]
+    {
+        result = $(path) ;
+    }
+    else
+    {
+        result = [ MATCH "^/?(.*)" : $(path) ] ;
+    }
+    result = [ sequence.join [ regex.split $(result) "/" ] : "\\" ] ;
+    return $(result) ;
+}
+
 rule make-UNIX ( native )
 {
     # VP: I have no idea now 'native' can be empty here! But it can!