Fix compilation bugs in APR. Move compiled libraries into a common libs

directory after building.  Removed (signal|cancel)_safe flags from context.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59170 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 3 insertions, 130 deletions

diff --git a/misc/beos/Makefile.in b/misc/beos/Makefile.in
index a502388fe..b590ca1f3 100644
--- a/misc/beos/Makefile.in
+++ b/misc/beos/Makefile.in
@@ -13,7 +13,7 @@ INCDIR1=../../include
 INCDIR2=../../file_io/unix
 INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
 
-LIB=../libmisc.a
+LIB=libmisc.a
 
 OBJS=start.o \
 
diff --git a/misc/beos/misc.h b/misc/beos/misc.h
index a496c372e..713409b4b 100644
--- a/misc/beos/misc.h
+++ b/misc/beos/misc.h
@@ -62,8 +62,6 @@
 
 struct context_t {
     struct ap_pool_t *pool;
-    ap_int16_t signal_safe;
-    ap_int16_t cancel_safe;
     void *prog_data;
 };
 
diff --git a/misc/beos/start.c b/misc/beos/start.c
index eb5231ceb..1cc60689b 100644
--- a/misc/beos/start.c
+++ b/misc/beos/start.c
@@ -93,37 +93,11 @@ ap_status_t ap_create_context(ap_context_t *cont, void *data, ap_context_t **new
     else {
         new->prog_data = data;
     }
-    if (cont) { 
-        new->signal_safe = cont->signal_safe;
-        new->cancel_safe = cont->cancel_safe;
-    }
-    else {
-        new->signal_safe = 0;
-        new->cancel_safe = 0;
-    }
  
     *newcont = new;
     return APR_SUCCESS;
 }
 
-ap_status_t ap_set_signal_safe(ap_context_t *cont, ap_int16_t safe)
-{
-    if (cont) { 
-        cont->signal_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
-ap_status_t ap_set_cancel_safe(ap_context_t *cont, ap_int16_t safe)
-{
-    if (cont) { 
-        cont->cancel_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
 ap_status_t ap_destroy_context(ap_context_t *cont)
 {
     ap_destroy_pool(cont->pool);
diff --git a/misc/os2/Makefile.in b/misc/os2/Makefile.in
index a042e3f39..024cf43b7 100644
--- a/misc/os2/Makefile.in
+++ b/misc/os2/Makefile.in
@@ -13,7 +13,7 @@ INCDIR1=../../include
 INCDIR2=../../file_io/os2
 INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
 
-LIB=../misc.a
+LIB=misc.a
 
 OBJS=start.o \
 
diff --git a/misc/os2/misc.h b/misc/os2/misc.h
index a496c372e..713409b4b 100644
--- a/misc/os2/misc.h
+++ b/misc/os2/misc.h
@@ -62,8 +62,6 @@
 
 struct context_t {
     struct ap_pool_t *pool;
-    ap_int16_t signal_safe;
-    ap_int16_t cancel_safe;
     void *prog_data;
 };
 
diff --git a/misc/os2/start.c b/misc/os2/start.c
index ade80f619..d79258d59 100644
--- a/misc/os2/start.c
+++ b/misc/os2/start.c
@@ -90,37 +90,11 @@ ap_status_t ap_create_context(struct context_t *cont, void *data, ap_context_t *
     else {
         new->prog_data = data;
     }
-    if (cont) { 
-        new->signal_safe = cont->signal_safe;
-        new->cancel_safe = cont->cancel_safe;
-    }
-    else {
-        new->signal_safe = 0;
-        new->cancel_safe = 0;
-    }
  
     *newcont = new;
     return APR_SUCCESS;
 }
 
-ap_status_t ap_set_signal_safe(struct context_t *cont, ap_int16_t safe)
-{
-    if (cont) { 
-        cont->signal_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
-ap_status_t ap_set_cancel_safe(struct context_t *cont, ap_int16_t safe)
-{
-    if (cont) {
-        cont->cancel_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
 ap_status_t ap_destroy_context(struct context_t *cont)
 {
     ap_destroy_pool(cont->pool);
diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in
index 80c7267e0..8c4068508 100644
--- a/misc/unix/Makefile.in
+++ b/misc/unix/Makefile.in
@@ -14,7 +14,7 @@ INCDIR1=../../include
 INCDIR2=../../file_io/unix
 INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
 
-LIB=../libmisc.a
+LIB=libmisc.a
 
 OBJS=start.o getopt.o 
 
diff --git a/misc/unix/misc.h b/misc/unix/misc.h
index a496c372e..713409b4b 100644
--- a/misc/unix/misc.h
+++ b/misc/unix/misc.h
@@ -62,8 +62,6 @@
 
 struct context_t {
     struct ap_pool_t *pool;
-    ap_int16_t signal_safe;
-    ap_int16_t cancel_safe;
     void *prog_data;
 };
 
diff --git a/misc/unix/start.c b/misc/unix/start.c
index 8b4bf00a3..b0ba0c20a 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -105,53 +105,12 @@ ap_status_t ap_create_context(struct context_t *cont, void *data,
     else {
         new->prog_data = data;
     }
-    if (cont) { 
-        new->signal_safe = cont->signal_safe;
-        new->cancel_safe = cont->cancel_safe;
-    }
-    else {
-        new->signal_safe = 0;
-        new->cancel_safe = 0;
-    }
  
     *newcont = new;
     return APR_SUCCESS;
 }
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_set_signal_safe(ap_context_t *, ap_int16_t)
- *    Set the signal safe attribute of the program.  If this bit-is on, then
- *    any apr function which uses this context IS signal safe.
- * arg 1) The context to modify.
- * arg 2) Should functions be signal safe or not?
- */
-ap_status_t ap_set_signal_safe(struct context_t *cont, ap_int16_t safe)
-{
-    if (cont) { 
-        cont->signal_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
-/* ***APRDOC********************************************************
- * ap_status_t ap_set_cancel_safe(ap_context_t *, ap_int16_t)
- *    Set the cancel safe attribute of the program.  If this bit-is off, then
- *    any thread which is in a function using this context IS NOT allowed
- *    to be cancelled.
- * arg 1) The context to modify.
- * arg 2) Should functions be cancellable or not?
- */
-ap_status_t ap_set_cancel_safe(struct context_t *cont, ap_int16_t safe)
-{
-    if (cont) {
-        cont->cancel_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
-/* ***APRDOC********************************************************
  * ap_status_t ap_destroy_context(ap_context_t *)
  *    Free the context and all of it's child contexts'.
  * arg 1) The context to free.
diff --git a/misc/win32/misc.h b/misc/win32/misc.h
index 716d16cd4..93a7dd37d 100644
--- a/misc/win32/misc.h
+++ b/misc/win32/misc.h
@@ -62,8 +62,6 @@
 
 struct context_t {
     struct ap_pool_t *pool;
-    ap_int16_t signal_safe;
-    ap_int16_t cancel_safe;
     void *prog_data;
 };
 
diff --git a/misc/win32/start.c b/misc/win32/start.c
index 99a64d985..f0a6b0ece 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -101,14 +101,6 @@ ap_status_t ap_create_context(ap_context_t *cont, void *data, ap_context_t **new
     else {
         new->prog_data = data;
     }
-    if (cont) { 
-        new->signal_safe = cont->signal_safe;
-        new->cancel_safe = cont->cancel_safe;
-    }
-    else {
-        new->signal_safe = 0;
-        new->cancel_safe = 0;
-    }
 
     iVersionRequested = MAKEWORD(WSAHighByte, WSALowByte);
     err = WSAStartup((WORD) iVersionRequested, &wsaData);
@@ -127,24 +119,6 @@ ap_status_t ap_create_context(ap_context_t *cont, void *data, ap_context_t **new
     return APR_SUCCESS;
 }
 
-ap_status_t ap_set_signal_safe(ap_context_t *cont, ap_int16_t safe)
-{
-    if (cont) { 
-        cont->signal_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
-ap_status_t ap_set_cancel_safe(ap_context_t *cont, ap_int16_t safe)
-{
-    if (cont) {
-        cont->cancel_safe = safe;
-        return APR_SUCCESS;
-    }
-    return APR_ENOCONT;
-}
-
 ap_status_t ap_destroy_context(ap_context_t *cont)
 {
     ap_destroy_pool(cont);