Mon Oct 29 14:44:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 50 insertions, 24 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8b3de0e6e9a..5ae0ceed800 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,25 @@
+Mon Oct 29 14:44:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-openbsd.h:
+          Improved OpenBSD support. Thanks to Vladimir Panov
+          <gbr at voidland dot org> for reporting this.
+
+        * ace/Dev_Poll_Reactor.h:
+        * ace/FlReactor/FlReactor.h:
+        * ace/FoxReactor/FoxReactor.h:
+        * ace/POSIX_Asynch_IO.h:
+        * ace/Proactor.h:
+        * ace/QtReactor/QtReactor.h:
+        * ace/Reactor.h:
+        * ace/Signal.h:
+          Doxygen improvements
+
+        * ace/Service_Config.{h,cpp}:
+          Changed be_a_deamon to bool
+
+        * ace/Service_Repository.cpp:
+          Initialise pointer with 0
+
 Mon Oct 29 14:17:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ARGV.h:
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index b8607ea58ad..d47b6387c35 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -844,7 +844,7 @@ public:
   /**
    * Check to see if @a handle is associated with a valid Event_Handler
    * bound to @a mask.  Return the @a event_handler associated with this
-   * <handler> if @a event_handler != 0.
+   * @c handler if @a event_handler != 0.
    */
   virtual int handler (ACE_HANDLE handle,
                        ACE_Reactor_Mask mask,
@@ -853,7 +853,7 @@ public:
   /**
    * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the @a event_handler associated with
-   * this <handler> if @a event_handler != 0.
+   * this @c handler if @a event_handler != 0.
    */
   virtual int handler (int signum,
                        ACE_Event_Handler ** = 0);
diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h
index 64ad4c0f10e..c2e3c64df06 100644
--- a/ACE/ace/FlReactor/FlReactor.h
+++ b/ACE/ace/FlReactor/FlReactor.h
@@ -68,7 +68,7 @@ public:
 
 protected:
   // = Register timers/handles with Fl.
-  /// Register a single <handler>.
+  /// Register a single @a handler.
   virtual int register_handler_i (ACE_HANDLE handle,
                                   ACE_Event_Handler *handler,
                                   ACE_Reactor_Mask mask);
diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h
index 46f0d3ed427..807d3981ed3 100644
--- a/ACE/ace/FoxReactor/FoxReactor.h
+++ b/ACE/ace/FoxReactor/FoxReactor.h
@@ -72,7 +72,7 @@ public:
 
 protected:
   // = Register timers/handles with Fox.
-  /// Register a single <handler>.
+  /// Register a single @a handler.
   virtual int register_handler_i (ACE_HANDLE handle,
                                   ACE_Event_Handler *handler,
                                   ACE_Reactor_Mask mask);
diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h
index 91bcd8b0285..25a360313bb 100644
--- a/ACE/ace/POSIX_Asynch_IO.h
+++ b/ACE/ace/POSIX_Asynch_IO.h
@@ -309,7 +309,7 @@ public:
  *
  *
  *     This class has all the information necessary for the
- *     <handler> to uniquiely identify the completion of the
+ *     @c handler to uniquiely identify the completion of the
  *     asynchronous write.
  */
 class ACE_Export ACE_POSIX_Asynch_Write_Stream_Result : public virtual ACE_Asynch_Write_Stream_Result_Impl,
@@ -440,7 +440,7 @@ protected:
  *
  *     Once <open> is called, multiple asynchronous <read>s can
  *     started using this class.  A <ACE_Asynch_Read_File::Result>
- *     will be passed back to the <handler> when the asynchronous
+ *     will be passed back to the @c handler when the asynchronous
  *     reads completes through the <ACE_Handler::handle_read_file>
  *     callback.
  *
@@ -492,12 +492,12 @@ private:
  *     <ACE_Asynch_Write_File_Result> for POSIX platforms.
  *
  *     This class has all the information necessary for the
- *     <handler> to uniquiely identify the completion of the
+ *     @c handler to uniquiely identify the completion of the
  *     asynchronous write.
  *
  *     This class differs slightly from
  *     <ACE_Asynch_Write_Stream::Result> as it calls back
- *     <ACE_Handler::handle_write_file> on the <handler> instead of
+ *     <ACE_Handler::handle_write_file> on the @c handler instead of
  *     <ACE_Handler::handle_write_stream>.  No additional state is
  *     required by this class as <ACE_Asynch_Result> can store the
  *     @a offset.
@@ -684,7 +684,7 @@ public:
   /**
    * This starts off an asynchronous accept.  The asynchronous accept
    * call also allows any initial data to be returned to the
-   * <handler>.  Upto @a bytes_to_read will be read and stored in the
+   * @c handler.  Upto @a bytes_to_read will be read and stored in the
    * @a message_block.  The <accept_handle> will be used for the
    * <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
    * handle will be created.
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h
index 3dcef886d87..704eef416ff 100644
--- a/ACE/ace/Proactor.h
+++ b/ACE/ace/Proactor.h
@@ -305,8 +305,8 @@ public:
 
   // = Timer management.
   /**
-   * Schedule a <handler> that will expire after <time>.  If it
-   * expires then @a act is passed in as the value to the <handler>'s
+   * Schedule a @a handler that will expire after <time>.  If it
+   * expires then @a act is passed in as the value to the @a handler's
    * <handle_timeout> callback method.  This method returns a
    * <timer_id>. This <timer_id> can be used to cancel a timer before
    * it expires.  The cancellation ensures that <timer_ids> are unique
@@ -324,7 +324,7 @@ public:
                                  const ACE_Time_Value &interval);
 
   // Same as above except @a interval it is used to reschedule the
-  // <handler> automatically.
+  // @a handler automatically.
 
   /// This combines the above two methods into one. Mostly for backward
   /// compatibility.
@@ -333,7 +333,7 @@ public:
                        const ACE_Time_Value &time,
                        const ACE_Time_Value &interval);
 
-  /// Cancel all timers associated with this <handler>.  Returns number
+  /// Cancel all timers associated with this @a handler.  Returns number
   /// of timers cancelled.
   int cancel_timer (ACE_Handler &handler,
                     int dont_call_handle_close = 1);
diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h
index 3f480deff6e..279516e38e6 100644
--- a/ACE/ace/QtReactor/QtReactor.h
+++ b/ACE/ace/QtReactor/QtReactor.h
@@ -143,7 +143,7 @@ protected:
 
     // = Register timers/handles with Qt
 
-    /// Register a single <handler>.
+    /// Register a single @a handler.
     virtual int register_handler_i (ACE_HANDLE handle,
         ACE_Event_Handler *handler,
         ACE_Reactor_Mask mask);
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index 1dff34d0a93..5f264ca49de 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -752,7 +752,7 @@ public:
   /**
    * Check to see if @a signum is associated with a valid Event_Handler
    * bound to a signal.  Return the @a event_handler associated with
-   * this <handler> if @a event_handler != 0.
+   * this @c handler if @a event_handler != 0.
    */
   int handler (int signum,
                ACE_Event_Handler **event_handler = 0);
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 14181ea71c5..a73b0a67b09 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -86,7 +86,7 @@ sig_atomic_t ACE_Service_Config::reconfig_occurred_ = 0;
 ACE_TCHAR *ACE_Service_Config::pid_file_name_ = 0;
 
 /// Shall we become a daemon process?
-int ACE_Service_Config::be_a_daemon_ = 0;
+bool ACE_Service_Config::be_a_daemon_ = false;
 
 // Number of the signal used to trigger reconfiguration.
 int ACE_Service_Config::signum_ = SIGHUP;
@@ -133,7 +133,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
         ACE_Service_Config::pid_file_name_ = getopt.opt_arg ();
         break;
       case 'b':
-        ACE_Service_Config::be_a_daemon_ = 1;
+        ACE_Service_Config::be_a_daemon_ = true;
         break;
       case 's':
         {
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index aa753c1881c..551333761be 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -572,7 +572,7 @@ private:
 
   // = Set by command-line options.
   /// Shall we become a daemon process?
-  static int be_a_daemon_;
+  static bool be_a_daemon_;
 
   /// Pathname of file to write process id.
   static ACE_TCHAR *pid_file_name_;
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 1ae307607b2..582f3a2729f 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -109,7 +109,7 @@ ACE_Service_Repository::open (size_t size)
 {
   ACE_TRACE ("ACE_Service_Repository::open");
 
-  ACE_Service_Type **temp;
+  ACE_Service_Type **temp = 0;
 
   ACE_NEW_RETURN (temp,
                   ACE_Service_Type *[size],
diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h
index f1d679f766b..fd82d3a7247 100644
--- a/ACE/ace/Signal.h
+++ b/ACE/ace/Signal.h
@@ -118,7 +118,7 @@ public:
 
   /**
    * Assigns the various fields of a @c sigaction struct and registers
-   * the <handler> to process signal @a signum via the @c sigaction
+   * the @a handler to process signal @a signum via the @c sigaction
    * function.
    */
   ACE_Sig_Action (ACE_SignalHandler handler,
@@ -128,7 +128,7 @@ public:
 
   /**
    * Assigns the various fields of a @c sigaction struct and registers
-   * the <handler> to process signal @a signum via the @c sigaction
+   * the @a handler to process signal @a signum via the @c sigaction
    * function.
    */
   ACE_Sig_Action (ACE_SignalHandler handler,
@@ -150,7 +150,7 @@ public:
 
   /**
    * Assigns the various fields of a @c sigaction struct and registers
-   * the <handler> to process all @a signalss via the @c sigaction
+   * the @a handler to process all @a signalss via the @c sigaction
    * function.
    */
   ACE_Sig_Action (const ACE_Sig_Set &signalss,
@@ -160,7 +160,7 @@ public:
 
   /**
    * Assigns the various fields of a @c sigaction struct and registers
-   * the <handler> to process all @a signalss via the @c sigaction
+   * the @a handler to process all @a signalss via the @c sigaction
    * function.
    */
   ACE_Sig_Action (const ACE_Sig_Set &signalss,
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index 96014aab7fc..2ee50da19c8 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -59,7 +59,11 @@
 #define ACE_HAS_SIG_MACROS
 #define ACE_HAS_CHARPTR_DL
 #define ACE_HAS_DIRENT
-#define ACE_USES_ASM_SYMBOL_IN_DLSYM
+
+// OpenBSD 3.6
+#if (OpenBSD < 200411)
+# define ACE_USES_ASM_SYMBOL_IN_DLSYM
+#endif
 
 #define ACE_LACKS_UCONTEXT_H