Fixed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@90985 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 2b4d6500b312ca8d79793c2777c4889b2c0ce60a..f12d5676f6bbb0de70e5d9e3647e991d46082945 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 1.3 STATUS:                                             -*-text-*-
-  Last modified at [$Date: 2001/09/10 12:34:49 $]
+  Last modified at [$Date: 2001/09/10 14:47:18 $]
 
 Release:
 
@@ -36,14 +36,6 @@ Release:
 
 RELEASE SHOWSTOPPERS:
 
-    The AcceptMutex code doesn't compile with Sun WorkShop 6 on Solaris.
-    The line "SAFE_ACCEPT((accept_mutex_child_init(pchild)));" in 
-    http_main.c is where it blows, complaining with
-      "http_main.c", line 4111: syntax error before or at: {
-    This is on Solaris 2.6, but with the latest Sun WorkShop.  This was
-    also seen on Solaris 2.5.1 with some previous level of Sun WorkShop.
-    Jeff will try to find time to unravel the macros and make it compile.
-
     ab is broken on many platforms.  Dirk has offered patch, it does not
     apply cleanly, he has offered to clean this up.
 

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 69b246559b89a63b87952f0bfb894b58be8c4e21..1cc4b8b8662f8beacda9cca6d2bdb3d968412506 100644 (file)
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -4108,7 +4108,7 @@ static void child_main(int child_num_arg)
 
     /* needs to be done before we switch UIDs so we have permissions */
     reopen_scoreboard(pchild);
-    SAFE_ACCEPT((accept_mutex_child_init(pchild)));
+    SAFE_ACCEPT(accept_mutex_child_init(pchild));
 
     set_group_privs();
 #ifdef MPE
@@ -4206,7 +4206,7 @@ static void child_main(int child_num_arg)
         */
 
        /* Lock around "accept", if necessary */
-       SAFE_ACCEPT((accept_mutex_on()));
+       SAFE_ACCEPT(accept_mutex_on());
 
        for (;;) {
            if (ap_listeners->next != ap_listeners) {