httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/include apr_lock.h apr_errno.h apr_file_io.h apr_general.h apr_network_io.h apr_thread_proc.h
Date Wed, 12 May 1999 12:00:13 GMT
rbb         99/05/12 05:00:12

  Modified:    include  apr_errno.h apr_file_io.h apr_general.h
                        apr_network_io.h apr_thread_proc.h
  Added:       include  apr_lock.h
  Log:
  Fixing some minor problems in the header files, and adding the locking header
  file.
  
  Revision  Changes    Path
  1.8       +8 -0      apache-apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_errno.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_errno.h	1999/05/10 16:58:17	1.7
  +++ apr_errno.h	1999/05/12 12:00:10	1.8
  @@ -58,6 +58,10 @@
   #ifndef APR_ERRNO_H
   #define APR_ERRNO_H
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif /* __cplusplus */
  +
   /* If this definition of APRStatus changes, then we can remove this, but right
      now, the decision was to use an errno-like implementation.
   */
  @@ -68,5 +72,9 @@
   
   #define ENOSTAT 4001
   #define ENOPOOL 4002
  +
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif  /* ! APR_ERRNO_H */
  
  
  
  1.22      +7 -0      apache-apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_file_io.h	1999/05/10 16:58:17	1.21
  +++ apr_file_io.h	1999/05/12 12:00:11	1.22
  @@ -66,6 +66,9 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif /* __cplusplus */
   
   /* Flags for ap_open */
   #define APR_READ     1           /* Open the file for reading */
  @@ -132,6 +135,10 @@
   /*accessor and general file_io functions. */
   char *ap_get_filename(ap_context_t *, ap_file_t *);
   
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif  /* ! APR_FILE_IO_H */
  +
   
  
  
  
  1.11      +8 -1      apache-apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_general.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_general.h	1999/05/10 16:58:17	1.10
  +++ apr_general.h	1999/05/12 12:00:11	1.11
  @@ -61,6 +61,10 @@
   #ifndef APR_GENERAL_H
   #define APR_GENERAL_H
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif /* __cplusplus */
  +
   #define TRUE 1
   #define FALSE 0
   
  @@ -88,7 +92,10 @@
   ap_status_t ap_set_signal_safe(ap_context_t *, ap_int16_t );
   ap_status_t ap_set_cancel_safe(ap_context_t *, ap_int16_t); 
   ap_context_t *ap_create_sub_context(ap_context_t *, void *);
  -ap_status_t ap_destroy_context(ap_context_t *);
  +ap_status_t ap_exit(ap_context_t *);
   
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif  /* ! APR_GENERAL_H */
  
  
  
  1.17      +8 -0      apache-apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_network_io.h	1999/05/10 16:58:18	1.16
  +++ apr_network_io.h	1999/05/12 12:00:11	1.17
  @@ -60,6 +60,10 @@
   #include "apr_errno.h"
   #include "networkio.h"
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif /* __cplusplus */
  +
   #ifndef MAX_SECS_TO_LINGER
   #define MAX_SECS_TO_LINGER 30
   #endif
  @@ -110,6 +114,10 @@
   
   ap_int32_t ap_poll(ap_context_t *, ap_pollfd_t *, ap_int32_t, ap_int32_t);
   /*  accessor functions   */
  +
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif  /* ! APR_FILE_IO_H */
   
  
  
  
  1.8       +33 -1     apache-apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_thread_proc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_thread_proc.h	1999/05/10 16:58:18	1.7
  +++ apr_thread_proc.h	1999/05/12 12:00:11	1.8
  @@ -60,17 +60,40 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif /* __cplusplus */
  +
   typedef enum {APR_SHELLCMD, APR_PROGRAM} ap_cmdtype_e;
   typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e;
   
  +#define CANCEL_ASYNCH    APR_CANCEL_ASYNCH
  +#define CANCEL_DEFER     APR_CANCEL_DEFER  
  +#define CANCEL_ENABLE    APR_CANCEL_ENABLE 
  +#define CANCEL_DISABLE   APR_CANCEL_DISABLE
  +
   typedef struct thread_t           ap_thread_t;
   typedef struct threadattr_t       ap_threadattr_t;
   typedef struct proc_t		  ap_proc_t;
   typedef struct procattr_t         ap_procattr_t;
   
  -/* Thread Function definitions */
  +typedef threadkey_t               ap_key_t;
   
  +typedef void *(*ap_thread_start_t)(void *);
   
  +/* Thread Function definitions */
  +ap_threadattr_t *ap_create_threadattr(ap_context_t *);
  +ap_status_t ap_setthreadattr_detach(ap_context_t *, ap_threadattr_t *, ap_int32_t);
  +ap_status_t ap_getthreadattr_detach(ap_context_t *, ap_threadattr_t *);
  +ap_thread_t *ap_create_thread(ap_context_t *, ap_threadattr_t *, ap_thread_start_t, void
*);
  +void ap_thread_exit(ap_context_t *, ap_status_t *);
  +ap_status_t ap_thread_join(ap_context_t *, ap_thread_t *thd, ap_status_t *); 
  +ap_status_t ap_thread_detach(ap_context_t *, ap_thread_t *);
  +
  +ap_status_t ap_cancel_thread(ap_context_t *, ap_thread_t *);
  +ap_status_t ap_setcanceltype(ap_context_t *, ap_int32_t);
  +ap_status_t ap_setcancelstate(ap_context_t *, ap_int32_t);
  +
   
   /* Process Function definitions */
   ap_procattr_t *ap_createprocattr_init(ap_context_t *);
  @@ -86,7 +109,16 @@
   ap_proc_t *ap_create_process(ap_context_t *, char *, char *const [], char **, ap_procattr_t
*);
   ap_status_t ap_wait_proc(ap_context_t *, ap_proc_t *, ap_wait_how_e);
   
  +#ifdef __cplusplus
  +}
  +#endif
  +
   #endif  /* ! APR_FILE_IO_H */
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.1                  apache-apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #ifndef APR_LOCKS_H
  #define APR_LOCKS_H
  
  #include "apr_general.h"
  #include "apr_errno.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif /* __cplusplus */
  
  typedef enum {APR_CROSS_PROCESS, APR_INTRAPROCESS, APR_LOCKALL} ap_locktype_e;
  
  typedef struct lock_t           ap_lock_t;
  
  /*   Function definitions */
  ap_lock_t *ap_create_lock(ap_context_t *, ap_locktype_e, char *);
  ap_status_t ap_lock(ap_context_t *, ap_lock_t *);
  ap_status_t ap_unlock(ap_context_t *, ap_lock_t *);
  ap_status_t ap_destroy_lock(ap_context_t *, ap_lock_t *);
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif  /* ! APR_LOCKS_H */
  
  
  

Mime
View raw message