httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr_file_io.h apr_lib.h apr_thread_proc.h
Date Fri, 08 Oct 1999 13:47:06 GMT
rbb         99/10/08 06:47:05

  Modified:    src/lib/apr/include apr_file_io.h apr_lib.h
                        apr_thread_proc.h
  Log:
  Undoing my last changes to these files.  These changes are a part of a much
  larger commit that somebody else is doing.  They got included by mistake
  
  Revision  Changes    Path
  1.10      +0 -1      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_file_io.h	1999/10/08 13:35:16	1.9
  +++ apr_file_io.h	1999/10/08 13:47:03	1.10
  @@ -111,7 +111,6 @@
   ap_status_t ap_close(ap_file_t *);
   ap_status_t ap_remove_file(char *, ap_context_t *);
   ap_status_t ap_eof(ap_file_t *);
  -ap_status_t ap_ferror(ap_file_t *);
   
   ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *);
   ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *);
  
  
  
  1.11      +2 -3      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_lib.h	1999/10/08 13:35:16	1.10
  +++ apr_lib.h	1999/10/08 13:47:04	1.11
  @@ -164,8 +164,6 @@
    * Define the prototypes for the various APR GP routines.
    */
   API_EXPORT(char *) ap_cpystrn(char *d, const char *s, size_t l);
  -API_EXPORT(int) ap_tokenize_to_argv(ap_context_t *token_context,
  -                                    char *arg_str, char ***argv_out);
   /*API_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/
   API_EXPORT(int) ap_slack(int l, int h);
   API_EXPORT_NONSTD(int) ap_execle(const char *c, const char *a, ...);
  @@ -373,8 +371,9 @@
   API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
   API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data);
   
  -API_EXPORT(void) ap_note_subprocess(struct context_t *a, pid_t pid,
  +/*API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, pid_t pid,
   				     enum kill_conditions how);
  +*/
   API_EXPORT(int)
   	ap_spawn_child(ap_context_t *p,
   			int (*func) (void *a, ap_child_info_t *c),
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_thread_proc.h	1999/10/08 13:35:16	1.4
  +++ apr_thread_proc.h	1999/10/08 13:47:04	1.5
  @@ -124,8 +124,8 @@
   ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *);
   
   ap_status_t ap_fork(ap_proc_t **, ap_context_t *);
  -ap_status_t ap_create_process(ap_proc_t **, ap_context_t *, const char *, 
  -                              char *const [], char **, ap_procattr_t *);
  +ap_status_t ap_create_process(ap_context_t *, char *, char *const [], char **, 
  +                              ap_procattr_t *, ap_proc_t **);
   ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how_e);
   
   ap_status_t ap_kill(ap_proc_t *, ap_int32_t);
  
  
  

Mime
View raw message