Date: 13 Oct 1999 09:31:38 -0000
Message-ID: <19991013093138.20117.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/misc/unix start.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         99/10/13 02:31:37

  Modified:    src/lib/apr/misc/os2 start.c Makefile.in
               src/lib/apr/misc/unix start.c
  Log:
  OS/2: Use the (slightly tweaked) unix start.c instead of our own.
  
  Revision  Changes    Path
  1.7       +1 -87     apache-2.0/src/lib/apr/misc/os2/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/start.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- start.c	1999/10/04 16:37:00	1.6
  +++ start.c	1999/10/13 09:31:34	1.7
  @@ -53,90 +53,4 @@
    *
    */
   
  -#include "apr_general.h"
  -#include "apr_errno.h"
  -#include "apr_pools.h"
  -#include "misc.h"
  -#include <errno.h>
  -#include <string.h>
  -
  -ap_status_t ap_create_context(ap_context_t **newcont, struct context_t *cont, void *data)
  -{
  -    struct context_t *new;
  -    ap_pool_t *pool;
  -
  -    if (cont) {
  -        pool = ap_make_sub_pool(cont->pool);
  -    }
  -    else {
  -        pool = ap_init_alloc();;
  -    }
  -        
  -    if (pool == NULL) {
  -        return APR_ENOPOOL;
  -    }   
  -
  -    if (cont) { 
  -        new = (struct context_t *)ap_palloc(cont, sizeof(struct context_t));
  -    }
  -    else {
  -        new = (struct context_t *)malloc(sizeof(struct context_t));
  -    }
  -
  -    new->pool = pool;
  -    if (data == NULL && cont) {
  -        new->prog_data = cont->prog_data;
  -    }
  -    else {
  -        new->prog_data = data;
  -    }
  - 
  -    *newcont = new;
  -    return APR_SUCCESS;
  -}
  -
  -ap_status_t ap_destroy_context(struct context_t *cont)
  -{
  -    ap_destroy_pool(cont);
  -    return APR_SUCCESS;
  -}
  -
  -/* ***APRDOC********************************************************
  - * ap_status_t ap_set_userdata(ap_context_t *, void *)
  - *    Set the data associated with the current context.
  - * arg 1) The current context.
  - * arg 2) The user data associated with the context.
  - */
  -ap_status_t ap_set_userdata(struct context_t *cont, void *data)
  -{
  -    if (cont) {
  -        cont->prog_data = data;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -/* ***APRDOC********************************************************
  - * ap_status_t ap_get_userdata(void **, ap_context_t *)
  - *    Return the data associated with the current context.
  - * arg 1) The current context.
  - * arg 2) The user data associated with the context.
  - */
  -ap_status_t ap_get_userdata(void **data, struct context_t *cont)
  -{
  -    if (cont) {
  -        (*data) = cont->prog_data;
  -        return APR_SUCCESS;
  -    }
  -    return APR_ENOCONT;
  -}
  -
  -/* ***APRDOC********************************************************
  - * ap_status_t ap_initialize()
  - *    Setup any APR internal data structures.  This MUST be the first
  - *    function called for any APR program.
  - */
  -ap_status_t ap_initialize(void)
  -{
  -    return APR_SUCCESS;
  -}
  +#include "../unix/start.c"
  
  
  
  1.5       +5 -2      apache-2.0/src/lib/apr/misc/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	1999/08/29 12:28:54	1.4
  +++ Makefile.in	1999/10/13 09:31:35	1.5
  @@ -51,7 +51,10 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -start.o: start.c $(INCDIR1)/apr_general.h \
  +getopt.o: getopt.c misc.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
  + $(INCDIR1)/apr_file_io.h
  +start.o: start.c ../unix/start.c $(INCDIR1)/apr_general.h \
  + $(INCDIR1)/apr_config.h $(INCDIR1)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/hsregex.h misc.h
  + $(INCDIR1)/apr_file_io.h ../unix/misc.h
  
  
  
  1.11      +2 -0      apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- start.c	1999/10/08 20:04:03	1.10
  +++ start.c	1999/10/13 09:31:36	1.11
  @@ -57,7 +57,9 @@
   #include "apr_errno.h"
   #include "apr_pools.h"
   #include "misc.h"
  +#ifdef HAVE_PTHREAD_H
   #include <pthread.h>
  +#endif
   #include <signal.h>
   #include <errno.h>
   #include <string.h>