diff options
| -rw-r--r-- | apr.dsp | 4 | ||||
| -rw-r--r-- | include/apr.h.in | 4 | ||||
| -rw-r--r-- | libapr.dsp | 4 | ||||
| -rwxr-xr-x | poll/unix/Makefile.in | 3 | ||||
| -rw-r--r-- | poll/unix/pollacc.c | 74 |
5 files changed, 2 insertions, 87 deletions
@@ -278,10 +278,6 @@ SOURCE=.\poll\unix\poll.c # End Source File # Begin Source File -SOURCE=.\poll\unix\pollacc.c -# End Source File -# Begin Source File - SOURCE=.\network_io\win32\sendrecv.c # End Source File # Begin Source File diff --git a/include/apr.h.in b/include/apr.h.in index 8f92bb4ce..ea96ee789 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -262,9 +262,7 @@ extern "C" { #define APR_HAS_OS_UUID 0 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible - * to poll on files/pipes. On such a system, the application can - * call apr_socket_from_file() to get an APR socket representation and - * then pass the socket representation to apr_poll_socket_add(). + * to poll on files/pipes. */ #define APR_FILES_AS_SOCKETS @file_as_socket@ diff --git a/libapr.dsp b/libapr.dsp index 93dca9dd4..7132691a3 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -284,10 +284,6 @@ SOURCE=.\poll\unix\poll.c # End Source File # Begin Source File -SOURCE=.\poll\unix\pollacc.c -# End Source File -# Begin Source File - SOURCE=.\network_io\win32\sendrecv.c # End Source File # Begin Source File diff --git a/poll/unix/Makefile.in b/poll/unix/Makefile.in index d9ab2219e..e4594d35b 100755 --- a/poll/unix/Makefile.in +++ b/poll/unix/Makefile.in @@ -2,8 +2,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ TARGETS = \ - poll.lo \ - pollacc.lo + poll.lo # bring in rules.mk for standard functionality diff --git a/poll/unix/pollacc.c b/poll/unix/pollacc.c deleted file mode 100644 index 275895811..000000000 --- a/poll/unix/pollacc.c +++ /dev/null @@ -1,74 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2003 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" -#include "apr_arch_networkio.h" -#include "apr_arch_file_io.h" - - -#if APR_FILES_AS_SOCKETS -/* I'm not sure if this needs to return an apr_status_t or not, but - * for right now, we'll leave it this way, and change it later if - * necessary. - */ -APR_DECLARE(apr_status_t) apr_socket_from_file(apr_socket_t **newsock, - apr_file_t *file) -{ - (*newsock) = apr_pcalloc(file->pool, sizeof(**newsock)); - (*newsock)->socketdes = file->filedes; - (*newsock)->cntxt = file->pool; - (*newsock)->timeout = file->timeout; - return APR_SUCCESS; -} -#endif |