cvs commit: apr/include apr_dso.h apr_mmap.h apr_network_io.h

[rb...@locus.apache.org]

rbb         00/12/02 11:02:27

  Modified:    include  apr_dso.h apr_mmap.h apr_network_io.h
  Log:
  Protect a couple of functions with the appropriate #if's.
  
  Revision  Changes    Path
  1.24      +4 -0      apr/include/apr_dso.h
  
  Index: apr_dso.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_dso.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_dso.h	2000/11/26 02:59:59	1.23
  +++ apr_dso.h	2000/12/02 19:02:27	1.24
  @@ -67,6 +67,8 @@
   extern "C" {
   #endif
   
  +#if APR_HAS_DSO
  +
   typedef struct apr_dso_handle_t        apr_dso_handle_t;
   typedef void *                        apr_dso_handle_sym_t;
   
  @@ -101,6 +103,8 @@
    * @param bufsize The size of the provided buffer
    */
   const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize);
  +
  +#endif /* APR_HAS_DSO */
   
   #ifdef __cplusplus
   }
  
  
  
  1.17      +4 -0      apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_mmap.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_mmap.h	2000/12/02 12:07:44	1.16
  +++ apr_mmap.h	2000/12/02 19:02:27	1.17
  @@ -93,6 +93,8 @@
       size_t size;
   };
   
  +#if APR_HAS_MMAP
  +
   /*   Function definitions */
   
   /** 
  @@ -119,6 +121,8 @@
    * @param offset The offset to move to.
    */
   apr_status_t apr_mmap_offset(void **addr, apr_mmap_t *mmap, apr_off_t offset);
  +
  +#endif /* APR_HAS_MMAP */
   
   #ifdef __cplusplus
   }
  
  
  
  1.86      +2 -0      apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_network_io.h,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- apr_network_io.h	2000/12/01 18:47:28	1.85
  +++ apr_network_io.h	2000/12/02 19:02:27	1.86
  @@ -607,6 +607,7 @@
                                 const char *key,
                                 apr_status_t (*cleanup) (void *));
   
  +#if APR_FILES_AS_SOCKETS
   /**
    * Convert a File type to a socket so that it can be used in a poll operation.
    * @param newsock the newly created socket which represents a file.
  @@ -616,6 +617,7 @@
    *      have the APR_FILES_AS_SOCKETS macro defined as true.
    */
   apr_status_t apr_socket_from_file(apr_socket_t **newsock, apr_file_t *file);
  +#endif
   
   /**
    * Given a hostname and a port, create an apr_in_addr for it...