Changeset 23

Timestamp:

Jan 19, 2010, 7:08:51 PM (15 years ago)

Author:

Silvan Scherrer

Message:

some changes to get more modules built

Location:

boost/trunk

Files:

• boost/config/platform/os2.hpp (modified) (1 diff)
• boost/thread/pthread/condition_variable.hpp (modified) (1 diff)
• boost/thread/pthread/mutex.hpp (modified) (1 diff)
• libs/filesystem/src/portability.cpp (modified) (1 diff)
• tools/jam/src/command.c (modified) (1 diff)

boost/trunk/boost/config/platform/os2.hpp ¶

@@ -60 +60 @@
 #define EAI_NODATA EAI_NONAME
 
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+
+#ifndef NI_MAXSERV
+#define NI_MAXSERV 32
+#endif
 
 // boilerplate code:

boost/trunk/boost/thread/pthread/condition_variable.hpp ¶

@@ -24 +24 @@
     {
         detail::interruption_checker check_for_interruption(&cond);
+#ifdef __OS2__
+        struct timespec timeout=detail::get_timespec(wait_until);
+#else
         struct timespec const timeout=detail::get_timespec(wait_until);
+#endif
         int const cond_res=pthread_cond_timedwait(&cond,m.mutex()->native_handle(),&timeout);
         if(cond_res==ETIMEDOUT)

boost/trunk/boost/thread/pthread/mutex.hpp ¶

@@ -182 +182 @@
         bool timed_lock(system_time const & abs_time)
         {
+#ifdef __OS2__
+            struct timespec timeout=detail::get_timespec(abs_time);
+#else
             struct timespec const timeout=detail::get_timespec(abs_time);
+#endif
             boost::pthread::pthread_mutex_scoped_lock const local_lock(&m);
             while(is_locked)

boost/trunk/libs/filesystem/src/portability.cpp ¶

@@ -49 +49 @@
     //  name_check functions  ----------------------------------------------//
 
-#   ifdef BOOST_WINDOWS
+#if defined(BOOST_WINDOWS) || defined(__OS2__)
     BOOST_FILESYSTEM_DECL bool native( const std::string & name )
     {

boost/trunk/tools/jam/src/command.c ¶

@@ -42 +42 @@
     cmd->shell = shell;
     cmd->next = 0;
-#ifdef OS_OS2
-    no_limit = 1;
-#endif
     lol_init( &cmd->args );
     lol_add( &cmd->args, targets );