apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr/include apr_want.h apr_file_io.h
Date Sat, 20 Jan 2001 11:58:22 GMT
gstein      01/01/20 03:58:22

  Modified:    include  apr_file_io.h
  Added:       include  apr_want.h
  Log:
  initial cut at a feature-based include system (rather than file-based)
  
  Revision  Changes    Path
  1.88      +3 -7      apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_io.h,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -u -r1.87 -r1.88
  --- apr_file_io.h	2001/01/19 17:29:44	1.87
  +++ apr_file_io.h	2001/01/20 11:58:21	1.88
  @@ -61,13 +61,9 @@
   #include "apr_errno.h"
   #include "apr_file_info.h"
   
  -#if APR_HAVE_STDIO_H
  -#include <stdio.h>      /* for SEEK_* */
  -#endif
  -
  -#if APR_HAVE_SYS_UIO_H
  -#include <sys/uio.h>
  -#endif
  +#define APR_WANT_STDIO          /* for SEEK_* */
  +#define APR_WANT_IOVEC
  +#include "apr_want.h"
   
   #ifdef __cplusplus
   extern "C" {
  
  
  
  1.1                  apr/include/apr_want.h
  
  Index: apr_want.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" 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 name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr.h"        /* configuration data */
  
  /*
   * Features:
   *
   *   APR_WANT_STRFUNC:  strcmp, strcat, strcpy, etc
   *   APR_WANT_MEMFUNC:  memcmp, memcpy, etc
   *   APR_WANT_STDIO:    <stdio.h> and related bits
   *   APR_WANT_IOVEC:    struct iovec
   *
   * Typical usage:
   *
   *   #define APR_WANT_STRFUNC
   *   #define APR_WANT_MEMFUNC
   *   #include "apr_want.h"
   *
   * The appropriate headers will be included.
   *
   * Note: it is safe to use this in a header (it won't interfere with other
   *       headers' or source files' use of apr_want.h)
   */
  
  /* --------------------------------------------------------------------- */
  
  #ifdef APR_WANT_STRFUNC
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_STRINGS_H
  #include <strings.h>
  #endif
  #undef APR_WANT_STRFUND
  #endif
  
  /* --------------------------------------------------------------------- */
  
  #ifdef APR_WANT_MEMFUNC
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #undef APR_WANT_MEMFUNC
  #endif
  
  /* --------------------------------------------------------------------- */
  
  #ifdef APR_WANT_STDIO
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #undef APR_WANT_STDIO
  #endif
  
  /* --------------------------------------------------------------------- */
  
  #ifdef APR_WANT_IOVEC
  #if APR_HAVE_SYS_UIO_H
  #include <sys/uio.h>
  #endif
  #undef APR_WANT_IOVEC
  #endif
  
  /* --------------------------------------------------------------------- */
  
  
  

Mime
View raw message