ChangeLogTag: Wed Apr 13 19:07:41 2005 Olli Savia <ops@iki.fi>

7 files changed, 131 insertions, 88 deletions

diff --git a/ChangeLog b/ChangeLog
index d653b378b53..09f8b520346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,60 +1,85 @@
-Wed Apr 13 14:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+Wed Apr 13 19:07:41 2005  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_time.inl:
+          Handle broken prototype of clock_settime() by adding
+          const_cast if ACE_HAS_NONCONST_CLOCK_SETTIME is defined.
+
+        * ace/OS_NS_unistd.inl:
+          Fixed wrong comment and removed commented out code.
+        
+        * ace/README:
+          Documented new macros ACE_HAS_NONCONST_CLOCK_SETTIME
+          and ACE_LACKS_SCANDIR_PROTOTYPE.
+        
+        * ace/TSS_T.h:
+          Fixed wrong comment.
+
+        * ace/config-lynxos.h:
+          Added new defines ACE_HAS_NONCONST_CLOCK_SETTIME,
+          ACE_HAS_SCANDIR, ACE_LACKS_SCANDIR_PROTOTYPE and
+          ACE_SCANDIR_CMP_USES_VOIDPTR.
+        
+        * ace/os_include/os_dirent.h:
+          Declare scandir() prototype if ACE_LACKS_SCANDIR_PROTOTYPE
+          is defined.
+        
+Wed Apr 13 14:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * ace/Reactor.cpp:
-	  Added call to close() to reactor implementation in destructor to
+          Added call to close() to reactor implementation in destructor to
           prevent problems with destruction of implementation instance when
           created on the stack.
 
 Wed Apr 13 07:32:19 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* ace/Thread_Hook.h:
-	* ace/Thread_Hook.cpp:
+        * ace/Thread_Hook.h:
+        * ace/Thread_Hook.cpp:
 
-	  Move ACE_Thread_Hook destructor out of line so it's not compiled
-	  and included in each translation unit that includes Thread_Hook.h.
+          Move ACE_Thread_Hook destructor out of line so it's not compiled
+          and included in each translation unit that includes Thread_Hook.h.
 
 Wed Apr 13 07:27:21 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* ace/CDR_Stream.h:
-	* ace/CDR_Stream.cpp:
+        * ace/CDR_Stream.h:
+        * ace/CDR_Stream.cpp:
 
-	  Move ACE_Char_Codeset_Translator destructor out of line so it is
-	  not compiled and included in each translation unit that includes
-	  CDR_Stream.h.
+          Move ACE_Char_Codeset_Translator destructor out of line so it is
+          not compiled and included in each translation unit that includes
+          CDR_Stream.h.
 
 Wed Apr 13 07:20:54 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* ace/Makefile.am:
-	* ace/ace.mpc:
+        * ace/Makefile.am:
+        * ace/ace.mpc:
 
-	  Add Proactor_Impl.cpp to list of source files.
+          Add Proactor_Impl.cpp to list of source files.
 
-	* ace/Proactor_Impl.h:
-	* ace/Proactor_Impl.cpp:
+        * ace/Proactor_Impl.h:
+        * ace/Proactor_Impl.cpp:
 
-	  Move ACE_Proactor_Impl destructor out of line into new file
-	  Proactor_Impl.cpp so it's not compiled and included in each
-	  translation unit that includes Proactor_Impl.h.
+          Move ACE_Proactor_Impl destructor out of line into new file
+          Proactor_Impl.cpp so it's not compiled and included in each
+          translation unit that includes Proactor_Impl.h.
 
 Tue Apr 12 19:30:40 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* ace/Makefile.am:
-	* ace/ace.mpc:
+        * ace/Makefile.am:
+        * ace/ace.mpc:
 
-	  Add Reactor_Impl.cpp to list of source files.
+          Add Reactor_Impl.cpp to list of source files.
 
-	* ace/Reactor_Impl.h:
-	* ace/Reactor_Impl.cpp:
+        * ace/Reactor_Impl.h:
+        * ace/Reactor_Impl.cpp:
 
-	  Move ACE_Reactor_Impl destructor out of line into new file
-	  Reactor_Impl.cpp so it's not compiled and included in each
-	  translation unit that includes Reactor_Impl.h.
+          Move ACE_Reactor_Impl destructor out of line into new file
+          Reactor_Impl.cpp so it's not compiled and included in each
+          translation unit that includes Reactor_Impl.h.
 
 Tue Apr 12 16:44:19 2005  Boris Kolpackov  <boris@kolpackov.net>
 
-	* protocols/ace/RMCast/Protocol.h:
+        * protocols/ace/RMCast/Protocol.h:
 
-	  Got rid of the "might be used uninitialized" warnings.
+          Got rid of the "might be used uninitialized" warnings.
 
 Tue Apr 12 09:17:34 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
@@ -65,7 +90,7 @@ Tue Apr 12 09:17:34 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 Tue Apr 12 13:11:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * bin/PerlACE/ProcessVX.pm:
-	  Enhanced functionality for controlling kernel reboot.
+          Enhanced functionality for controlling kernel reboot.
 
 Tue Apr 12 07:53:39 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index 087d722f188..d663dcbfb1e 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -81,12 +81,16 @@ ACE_INLINE int
 ACE_OS::clock_settime (clockid_t clockid, const struct timespec *ts)
 {
 #if defined (ACE_HAS_CLOCK_SETTIME)
+#  if defined (ACE_HAS_NONCONST_CLOCK_SETTIME)
+  ACE_OSCALL_RETURN (::clock_settime (clockid, const_cast<struct timespec *>(ts)), int, -1);
+#  else
   ACE_OSCALL_RETURN (::clock_settime (clockid, ts), int, -1);
+#  endif /* ACE_HAS_NONCONST_CLOCK_SETTIME */
 #else
   ACE_UNUSED_ARG (clockid);
   ACE_UNUSED_ARG (ts);
   ACE_NOTSUP_RETURN (-1);
-#endif
+#endif /* ACE_HAS_CLOCK_SETTIME */
 }
 
 // Magic number declaration and definition for ctime and ctime_r ()
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index fb0380c44c7..9924180c1c0 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -158,8 +158,6 @@ ACE_OS::rmdir (const char *path)
   phile_path = (char *) ACE_OS::malloc (strlen (path));
   if (phile_path == 0)
     {
-//       ACE_OS::printf ("malloc in remove_dir failed: [%X]\n",
-//                       errno);
       return -1;
     }
   else
@@ -192,7 +190,7 @@ ACE_OS::rmdir (const char *path)
                         int, -1);
 #else
   ACE_OSCALL_RETURN (::rmdir (path), int, -1);
-#endif /* ACE_HAS_PACE */
+#endif /* ACE_PSOS_LACKS_PHILE */
 }
 
 #if defined (ACE_HAS_WCHAR)
diff --git a/ace/README b/ace/README
index af5701fe2a5..2fc4a14df34 100644
--- a/ace/README
+++ b/ace/README
@@ -29,7 +29,7 @@ ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES
                                         Win32 only.  Users want to use
                                         a predefined security
                                         attributes defined in
-                                      ACE_OS::default_win32_security_attributes
+                                        ACE_OS::default_win32_security_attributes
                                         as the default security
                                         object.
 ACE_DISABLE_DEBUG_DLL_CHECK             Define this if you don't want
@@ -115,13 +115,11 @@ ACE_USES_GPROF                          ACE calls getitimer before spawning
                                         after spawning the thread in
                                         order to overcome the problems
                                         of gprof with multithreaded
-                                        applications.  It uses the
-                                        idea from
-                             http://sam.zoy.org/writings/programming/gprof.html
+                                        applications. It uses the idea from
+                                        http://sam.zoy.org/writings/programming/gprof.html
 ACE_WSOCK_VERSION                       A parameter list indicating
                                         the version of WinSock (e.g.,
                                         "1, 1" is version 1.1).
-
 ACE_HAS_AIO_CALLS                       Platform supports POSIX aio* calls.
                                         Corresponds to _POSIX_ASYNCHRONOUS_IO
                                         constant in <unistd.h>.
@@ -407,6 +405,9 @@ ACE_HAS_MUTEX_TIMEOUTS                  Compiler supports timed mutex
 ACE_HAS_NEW_NOTHROW                     Compiler offers new (nothrow).
 ACE_HAS_NONCONST_CHDIR                  Platform uses non-const char *
                                         in call to chdir
+ACE_HAS_NONCONST_CLOCK_SETTIME          Platform uses non-const
+                                        struct timespec * in call to
+                                        clock_settime
 ACE_HAS_NONCONST_OPENDIR                Platform uses non-const char *
                                         in call to opendir
 ACE_HAS_NONCONST_UNLINK                 Platform uses non-const char *
@@ -417,23 +418,23 @@ ACE_HAS_NONCONST_GETBY                  Platform uses non-const char *
 ACE_HAS_NONCONST_MSGSND                 Platform has a non-const
                                         parameter to msgsend() (e.g.,
                                         SCO).
-ACE_HAS_NONCONST_READV			Platform omits const qualifier from
-					iovec parameter in readv() prototype.
+ACE_HAS_NONCONST_READV                  Platform omits const qualifier from
+                                        iovec parameter in readv() prototype.
 ACE_HAS_NONCONST_SELECT_TIMEVAL         Platform's select() uses
                                         non-const timeval* (only found
                                         on Linux right now)
-ACE_HAS_NONCONST_SENDMSG		Platform omits const qualifier
-					from msghdr parameter in sendmsg()
-					prototype.
+ACE_HAS_NONCONST_SENDMSG                Platform omits const qualifier
+                                        from msghdr parameter in sendmsg()
+                                        prototype.
 ACE_HAS_NONCONST_SETRLIMIT              Platform omits const qualifier
-					from rlimit parameter in setrlimit()
-					prototype.
+                                        from rlimit parameter in setrlimit()
+                                        prototype.
 ACE_HAS_NONCONST_STAT                   Platform's stat function has non const
                                         name argument
 ACE_HAS_NONCONST_SWAB                   Platform's swab function has non
                                         const src argument
 ACE_HAS_NONCONST_WRITEV                 Platform omits const qualifier from
-					iovec parameter in writev() prototype.
+                                        iovec parameter in writev() prototype.
 ACE_HAS_OLD_MALLOC                      Compiler/platform uses old
                                         malloc()/free() prototypes
                                         (ugh)
@@ -673,8 +674,8 @@ ACE_HAS_THR_C_DEST                      The pthread_keycreate()
 ACE_HAS_THR_C_FUNC                      The pthread_create() routine
                                         *must* take extern C
                                         functions.
-ACE_HAS_TIMEZONE			Platform/compiler supports
-					global "timezone" variable.
+ACE_HAS_TIMEZONE                        Platform/compiler supports
+                                        global "timezone" variable.
 ACE_HAS_TIMEZONE_GETTIMEOFDAY           Platform/compiler supports
                                         timezone * as second parameter
                                         to gettimeofday()
@@ -721,7 +722,7 @@ ACE_HAS_UINT64_T                        Platform provides the uint64_t type.
 
 ACE_INT8_TYPE                           Specific type to use for ACE_INT8.
                                         If not defined, ACE will attempt to
-					determine the correct type.
+                                        determine the correct type.
 ACE_INT16_TYPE                          Specific type to use for ACE_INT16.
                                         If not defined, ACE will attempt to
                                         determine the correct type.
@@ -741,49 +742,49 @@ ACE_UINT32_TYPE                         Specific type to use for ACE_UINT32.
                                         If not defined, ACE will attempt to
                                         determine the correct type.
 ACE_UINT64_TYPE                         Specific type to use for ACE_UINT64.
-					If not defined, ACE will attempt to 
-					determine the correct type.
+                                        If not defined, ACE will attempt to 
+                                        determine the correct type.
 
 ACE_INT8_FORMAT_SPECIFIER               String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_INT8 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_INT8 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_INT16_FORMAT_SPECIFIER              String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_INT16 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_INT16 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_INT32_FORMAT_SPECIFIER              String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_INT32 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_INT32 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_INT64_FORMAT_SPECIFIER              String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_INT64 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_INT64 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_UINT8_FORMAT_SPECIFIER              String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_UINT8 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_UINT8 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_UINT16_FORMAT_SPECIFIER             String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_UINT16 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_UINT16 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_UINT32_FORMAT_SPECIFIER             String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_UINT32 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_UINT32 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 ACE_UINT64_FORMAT_SPECIFIER             String literal containing *printf 
-					format specifier (including the '%')
-					to be used for ACE_UINT64 values.  If
-					not defined, ACE will attempt to 
-					determine the correct setting.
+                                        format specifier (including the '%')
+                                        to be used for ACE_UINT64 values.  If
+                                        not defined, ACE will attempt to 
+                                        determine the correct setting.
 
 ACE_HAS_VOIDPTR_GETTIMEOFDAY            Platform/compiler supports
                                         void * as second parameter
@@ -885,8 +886,8 @@ ACE_LACKS_GETPGID                       Platform lacks getpgid() call
 ACE_LACKS_GETSERVBYNAME                 Platforms lacks
                                         getservbyname() (e.g., VxWorks
                                         and Chorus).
-ACE_LACKS_GETIPNODEBYADDR		Platform lacks getipnodebyaddr().
-ACE_LACKS_GETIPNODEBYNAME		Platform lacks getipnodebyname().
+ACE_LACKS_GETIPNODEBYADDR               Platform lacks getipnodebyaddr().
+ACE_LACKS_GETIPNODEBYNAME               Platform lacks getipnodebyname().
 ACE_LACKS_INET_ATON                     Platform lacks the inet_aton()
                                         function.
 ACE_LACKS_INET_ATON_PROTOTYPE           Platform/compiler lacks the
@@ -1001,6 +1002,9 @@ ACE_LACKS_RWLOCKATTR_PSHARED            Platform lacks
 ACE_LACKS_SBRK                          Platform lacks a working
                                         sbrk() (e.g., Win32 and
                                         VxWorks)
+ACE_LACKS_SCANDIR_PROTOTYPE             Platform/compiler lacks
+                                        scandir() prototype
+                                        (e.g., LynxOS)
 ACE_LACKS_SEEKDIR                       Platform uses ACE_HAS_DIRENT
                                         but does not have seekdir ().
 ACE_LACKS_SEMBUF_T                      Platform lacks struct sembuf
diff --git a/ace/TSS_T.h b/ace/TSS_T.h
index 33877be04b3..537a89cc15a 100644
--- a/ace/TSS_T.h
+++ b/ace/TSS_T.h
@@ -33,7 +33,7 @@
 # else
 #   define ACE_TSS_TYPE(T) T
 #   define ACE_TSS_GET(I, T) (I)
-# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATIOND) */
+# endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
 
 #include "ace/Thread_Mutex.h"
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 358b9f1f071..adb7592b585 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -23,7 +23,7 @@
 #endif /* __GNUG__ */
 
 #if ACE_LYNXOS_MAJOR > 3 || (ACE_LYNXOS_MAJOR == 3 && ACE_LYNXOS_MINOR > 0)
-  // LynxOS 3.1.0 or greater need ipc_1c.h to be included before net/if.h
+  // LynxOS 3.1.0 or greater needs ipc_1c.h to be included before net/if.h
   // to avoid macro conflict.
 # define ACE_NEEDS_IPC_1C_H
 #endif /* ACE_LYNXOS_MAJOR */
@@ -57,6 +57,7 @@
 #define ACE_HAS_LYNXOS_SIGNALS
 #define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
+#define ACE_HAS_NONCONST_CLOCK_SETTIME
 #define ACE_HAS_NONCONST_GETBY
 #define ACE_HAS_NONCONST_MSGSND
 #define ACE_HAS_NONCONST_READV
@@ -68,6 +69,7 @@
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+#define ACE_HAS_SCANDIR
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SHM_OPEN
 #define ACE_HAS_SIGINFO_T
@@ -95,6 +97,7 @@
 #define ACE_LACKS_REALPATH
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SCANDIR_PROTOTYPE
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
@@ -109,6 +112,8 @@
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_WCHAR_H
 #define ACE_MALLOC_ALIGN 8
+#define ACE_SCANDIR_CMP_USES_VOIDPTR
+
 // Don't use MAP_FIXED, at least for now.
 #define ACE_MAP_FIXED 0
 // LynxOS, through 3.0.0, does not support MAP_PRIVATE, so map it to
diff --git a/ace/os_include/os_dirent.h b/ace/os_include/os_dirent.h
index d76f0f4010b..9564634348e 100644
--- a/ace/os_include/os_dirent.h
+++ b/ace/os_include/os_dirent.h
@@ -105,6 +105,13 @@ typedef DIR ACE_DIR;
 # undef rewinddir
 #endif /* rewinddir */
 
+#if defined (ACE_LACKS_SCANDIR_PROTOTYPE)
+int scandir (const char *,
+             struct dirent ***,
+             int (*) (const struct dirent *),
+             int (*) (const void *, const void *));
+#endif /* ACE_LACKS_SCANDIR_PROTOTYPE */
+    
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */