stoddard 99/10/25 16:55:50
Modified: src/lib/apr/include apr_network_io.h
src/lib/apr/network_io/win32 sockopt.c sockets.c networkio.h
src/lib/apr aprlib.mak aprlib.dsp aprlib.def
Added: src/lib/apr/network_io/win32 sockaddr.c
Log:
Add local_addr and remote_addr to APR for Windows
Revision Changes Path
1.14 +0 -2 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr_network_io.h 1999/10/24 13:08:24 1.13
+++ apr_network_io.h 1999/10/25 23:55:07 1.14
@@ -137,10 +137,8 @@
ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock);
ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock);
-#ifdef HAVE_NETINET_IN_H
ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t
*sock);
ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t
*sock);
-#endif
ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *);
ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t);
1.5 +1 -1 apache-2.0/src/lib/apr/network_io/win32/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sockopt.c 1999/10/10 20:34:59 1.4
+++ sockopt.c 1999/10/25 23:55:23 1.5
@@ -138,7 +138,7 @@
{
struct hostent *hptr;
- hptr = gethostbyaddr((char *)&(sock->addr->sin_addr),
+ hptr = gethostbyaddr((char *)&(sock->local_addr->sin_addr),
sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
1.12 +16 -44 apache-2.0/src/lib/apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sockets.c 1999/10/24 13:08:26 1.11
+++ sockets.c 1999/10/25 23:55:28 1.12
@@ -83,10 +83,10 @@
return APR_ENOMEM;
}
(*new)->cntxt = cont;
- (*new)->addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
- sizeof(struct sockaddr_in));
+ (*new)->local_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
+ sizeof(struct
sockaddr_in));
- if ((*new)->addr == NULL) {
+ if ((*new)->local_addr == NULL) {
return APR_ENOMEM;
}
/* For right now, we are not using socket groups. We may later.
@@ -94,11 +94,11 @@
*/
(*new)->sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- (*new)->addr->sin_family = AF_INET;
+ (*new)->local_addr->sin_family = AF_INET;
- (*new)->addr_len = sizeof(*(*new)->addr);
+ (*new)->addr_len = sizeof(*(*new)->local_addr);
- (*new)->addr->sin_port = 0;
+ (*new)->local_addr->sin_port = 0;
if ((*new)->sock == INVALID_SOCKET) {
return APR_EEXIST;
@@ -140,38 +140,10 @@
return socket_cleanup(thesocket);
}
-ap_status_t ap_setport(struct socket_t *sock, ap_uint32_t port)
-{
- sock->addr->sin_port = htons((short)port);
- return APR_SUCCESS;
-}
-ap_status_t ap_getport(ap_uint32_t *port, struct socket_t *sock)
-{
- *port = ntohs(sock->addr->sin_port);
- return APR_SUCCESS;
-}
-ap_status_t ap_setipaddr(struct socket_t *sock, const char *addr)
-{
- if (!strcmp(addr, APR_ANYADDR)) {
- sock->addr->sin_addr.s_addr = htonl(INADDR_ANY);
- return APR_SUCCESS;
- }
-
- sock->addr->sin_addr.s_addr = inet_addr(addr);
-
- return APR_SUCCESS;
-}
-ap_status_t ap_getipaddr(char *addr, ap_ssize_t len,
- const struct socket_t *sock)
-{
- char *temp = inet_ntoa(sock->addr->sin_addr);
- ap_cpystrn(addr,temp,len-1);
- return APR_SUCCESS;
-}
ap_status_t ap_bind(struct socket_t *sock)
{
- sock->addr->sin_addr.s_addr = INADDR_ANY;
- if (bind(sock->sock, (struct sockaddr *)sock->addr, sock->addr_len) ==
-1) {
+ sock->local_addr->sin_addr.s_addr = INADDR_ANY;
+ if (bind(sock->sock, (struct sockaddr *)sock->local_addr,
sock->addr_len) == -1) {
return errno;
}
else
@@ -192,11 +164,11 @@
sizeof(struct socket_t));
(*new)->cntxt = connection_context;
- (*new)->addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
+ (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
sizeof(struct sockaddr_in));
(*new)->addr_len = sizeof(struct sockaddr_in);
- (*new)->sock = accept(sock->sock, (struct sockaddr *)(*new)->addr,
+ (*new)->sock = accept(sock->sock, (struct sockaddr *)(*new)->local_addr,
&(*new)->addr_len);
if ((*new)->sock == INVALID_SOCKET) {
@@ -214,18 +186,18 @@
int lasterror;
fd_set temp;
- if ((sock->sock == INVALID_SOCKET) || (!sock->addr)) {
+ if ((sock->sock == INVALID_SOCKET) || (!sock->local_addr)) {
return APR_ENOTSOCK;
}
if (*hostname >= '0' && *hostname <= '9' &&
strspn(hostname, "0123456789.") == strlen(hostname)) {
- sock->addr->sin_addr.s_addr = inet_addr(hostname);
+ sock->local_addr->sin_addr.s_addr = inet_addr(hostname);
}
else {
hp = gethostbyname(hostname);
- memcpy((char *)&sock->addr->sin_addr, hp->h_addr_list[0],
hp->h_length);
- sock->addr_len = sizeof(*sock->addr);
+ memcpy((char *)&sock->local_addr->sin_addr, hp->h_addr_list[0],
hp->h_length);
+ sock->addr_len = sizeof(*sock->local_addr);
if (!hp) {
if (h_errno == TRY_AGAIN) {
return EAGAIN;
@@ -234,9 +206,9 @@
}
}
- sock->addr->sin_family = AF_INET;
+ sock->local_addr->sin_family = AF_INET;
- if (connect(sock->sock, (const struct sockaddr *)sock->addr,
+ if (connect(sock->sock, (const struct sockaddr *)sock->local_addr,
sock->addr_len) == 0) {
return APR_SUCCESS;
}
1.4 +2 -1 apache-2.0/src/lib/apr/network_io/win32/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/networkio.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- networkio.h 1999/10/08 21:28:36 1.3
+++ networkio.h 1999/10/25 23:55:30 1.4
@@ -62,7 +62,8 @@
struct socket_t {
ap_context_t *cntxt;
SOCKET sock;
- struct sockaddr_in *addr;
+ struct sockaddr_in *local_addr;
+ struct sockaddr_in *remote_addr;
size_t addr_len;
int timeout;
};
1.1 apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
Index: sockaddr.c
===================================================================
/* ====================================================================
* 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
* [EMAIL PROTECTED]
*
* 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/>.
*
*/
#include "networkio.h"
#include "apr_network_io.h"
#include "apr_general.h"
#include "apr_lib.h"
#include <string.h>
/* ***APRDOC********************************************************
* ap_status_t ap_set_local_port(ap_socket_t *socket, ap_uint32_t port)
* Assocaite a local port with a socket.
* arg 1) The socket to set
* arg 2) The local port this socket will be dealing with.
* NOTE: This does not bind the two together, it is just telling apr
* that this socket is going to use this port if possible. If
* the port is already used, we won't find out about it here.
*/
ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
{
sock->local_addr->sin_port = htons((short)port);
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_set_remote_port(ap_socket_t *socket, ap_uint32_t port)
* Assocaite a remote port with a socket.
* arg 1) The socket to enquire about.
* arg 2) The local port this socket will be dealing with.
* NOTE: This does not make a connection to the remote port, it is just
* telling apr which port ap_connect() should attempt to connect to.
*/
ap_status_t ap_set_remote_port(struct socket_t *sock, ap_uint32_t port)
{
sock->remote_addr->sin_port = htons((short)port);
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *socket)
* Return the local port with a socket.
* arg 1) The local port this socket is associated with.
* arg 2) The socket to enquire about.
*/
ap_status_t ap_get_local_port(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->local_addr->sin_port);
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *socket)
* Return the remote port associated with a socket.
* arg 1) The remote port this socket is associated with.
* arg 2) The socket to enquire about.
*/
ap_status_t ap_get_remote_port(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->remote_addr->sin_port);
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_set_local_ipaddr(ap_socket_t *socket, cont char *addr)
* Assocaite a local socket addr with an apr socket.
* arg 1) The socket to use
* arg 2) The IP address to attach to the socket.
* Use APR_ANYADDR to use any IP addr on the machine.
* NOTE: This does not bind the two together, it is just telling apr
* that this socket is going to use this address if possible.
*/
ap_status_t ap_set_local_ipaddr(struct socket_t *sock, const char *addr)
{
u_long ipaddr;
if (!strcmp(addr, APR_ANYADDR)) {
sock->local_addr->sin_addr.s_addr = htonl(INADDR_ANY);
return APR_SUCCESS;
}
ipaddr = inet_addr(addr);
if (ipaddr == INADDR_NONE) {
return APR_ENOADDRESS;
}
sock->local_addr->sin_addr.s_addr = ipaddr;
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_set_remote_ipaddr(ap_socket_t *socket, cont char *addr)
* Assocaite a remote socket addr with an apr socket.
* arg 1) The socket to use
* arg 2) The IP address to attach to the socket.
* NOTE: This does not make a connection to the remote address, it is just
* telling apr which address ap_connect() should attempt to connect to.
*/
ap_status_t ap_set_remote_ipaddr(struct socket_t *sock, const char *addr)
{
u_long ipaddr;
if (!strcmp(addr, APR_ANYADDR)) {
sock->remote_addr->sin_addr.s_addr = htonl(INADDR_ANY);
return APR_SUCCESS;
}
ipaddr = inet_addr(addr);
if (ipaddr == INADDR_NONE) {
return APR_ENOADDRESS;
}
sock->remote_addr->sin_addr.s_addr = ipaddr;
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *socket)
* Return the local IP address associated with an apr socket.
* arg 1) The local IP address associated with the socket.
* arg 2) The socket to use
*/
ap_status_t ap_get_local_ipaddr(char **addr, const struct socket_t *sock)
{
*addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *socket)
* Return the remote IP address associated with an apr socket.
* arg 1) The remote IP address associated with the socket.
* arg 2) The socket to use
*/
ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
{
*addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t
*socket)
* Return the local socket name as a BSD style struct sockaddr_in.
* arg 1) The local name associated with the socket.
* arg 2) The socket to use
*/
ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct
socket_t *sock)
{
*name = sock->local_addr;
return APR_SUCCESS;
}
/* ***APRDOC********************************************************
* ap_status_t ap_get_remote_name(struct sockaddr_in **name, const
ap_socket_t *socket)
* Return the remote socket name as a BSD style struct sockaddr_in.
* arg 1) The remote name associated with the socket.
* arg 2) The socket to use
*/
ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct
socket_t *sock)
{
*name = sock->remote_addr;
return APR_SUCCESS;
}
1.4 +232 -434 apache-2.0/src/lib/apr/aprlib.mak
Index: aprlib.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aprlib.mak 1999/10/05 04:19:21 1.3
+++ aprlib.mak 1999/10/25 23:55:39 1.4
@@ -25,10 +25,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "aprlib - Win32 Release"
OUTDIR=.\Release
@@ -75,6 +71,7 @@
[EMAIL PROTECTED] "$(INTDIR)\sendrecv.obj"
[EMAIL PROTECTED] "$(INTDIR)\signal.obj"
[EMAIL PROTECTED] "$(INTDIR)\signals.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\sockaddr.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockets.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockopt.obj"
[EMAIL PROTECTED] "$(INTDIR)\start.obj"
@@ -91,12 +88,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32"
/I\
"./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\aprlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprlib.bsc"
BSC32_SBRS= \
@@ -137,6 +168,7 @@
"$(INTDIR)\sendrecv.obj" \
"$(INTDIR)\signal.obj" \
"$(INTDIR)\signals.obj" \
+ "$(INTDIR)\sockaddr.obj" \
"$(INTDIR)\sockets.obj" \
"$(INTDIR)\sockopt.obj" \
"$(INTDIR)\start.obj" \
@@ -197,6 +229,7 @@
[EMAIL PROTECTED] "$(INTDIR)\sendrecv.obj"
[EMAIL PROTECTED] "$(INTDIR)\signal.obj"
[EMAIL PROTECTED] "$(INTDIR)\signals.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\sockaddr.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockets.obj"
[EMAIL PROTECTED] "$(INTDIR)\sockopt.obj"
[EMAIL PROTECTED] "$(INTDIR)\start.obj"
@@ -216,12 +249,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
"./misc/win32" /I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\aprlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\aprlib.bsc"
BSC32_SBRS= \
@@ -262,6 +329,7 @@
"$(INTDIR)\sendrecv.obj" \
"$(INTDIR)\signal.obj" \
"$(INTDIR)\signals.obj" \
+ "$(INTDIR)\sockaddr.obj" \
"$(INTDIR)\sockets.obj" \
"$(INTDIR)\sockopt.obj" \
"$(INTDIR)\start.obj" \
@@ -278,39 +346,12 @@
!ENDIF
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
!IF "$(CFG)" == "aprlib - Win32 Release" || "$(CFG)" == "aprlib - Win32
Debug"
SOURCE=.\time\win32\access.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_ACCES=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -330,7 +371,29 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_ACCES=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_win.h"\
+ ".\time\win32\atime.h"\
+
+
+"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_cpystrn.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_C=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -349,7 +412,27 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_C=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_execve.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
NODEP_CPP_APR_E=\
".\lib\apr_config.h"\
@@ -358,7 +441,19 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+
+"$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_fnmatch.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_F=\
".\file_io\win32\readdir.h"\
".\inc\apr_fnmatch.h"\
@@ -379,7 +474,28 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_F=\
+ ".\file_io\win32\readdir.h"\
+ ".\inc\apr_fnmatch.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_getpass.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_G=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -398,7 +514,27 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_G=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_md5.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_M=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -418,7 +554,28 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_M=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_md5.h"\
+ ".\include\apr_win.h"\
+
+
+"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_pools.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_P=\
".\file_io\win32\readdir.h"\
".\inc\apr_pools.h"\
@@ -441,7 +598,30 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+
+DEP_CPP_APR_P=\
+ ".\file_io\win32\readdir.h"\
+ ".\inc\apr_pools.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_lock.h"\
+ ".\include\apr_win.h"\
+ ".\misc\win32\misc.h"\
+
+
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\lib\apr_slack.c
+
+!IF "$(CFG)" == "aprlib - Win32 Release"
+
DEP_CPP_APR_S=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -456,9 +636,6 @@
".\lib\apr_config.h"\
".\lib\http_log.h"\
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
"./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I
"./file_io/win32/" /D\
"WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
@@ -472,6 +649,14 @@
!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+DEP_CPP_APR_S=\
+ ".\file_io\win32\readdir.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_lib.h"\
+ ".\include\apr_win.h"\
+
CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
"./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I
"./file_io/win32/" /D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
@@ -615,9 +800,6 @@
SOURCE=.\misc\win32\getopt.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_GETOP=\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
@@ -634,26 +816,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_GETOP=\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_win.h"\
- ".\misc\win32\misc.h"\
-
-
-"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\locks\win32\locks.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_LOCKS=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -677,33 +840,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_LOCKS=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_lock.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_portable.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_time.h"\
- ".\include\apr_win.h"\
- ".\locks\win32\locks.h"\
-
-
-"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\misc\win32\names.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_NAMES=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -722,27 +859,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_NAMES=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\file_io\win32\open.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_OPEN_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -768,34 +885,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_OPEN_=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_lock.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_portable.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_time.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\file_io\win32\pipe.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_PIPE_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -816,29 +906,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_PIPE_=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\network_io\win32\poll.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_POLL_=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -858,29 +926,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_POLL_=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_win.h"\
- ".\network_io\win32\networkio.h"\
-
-
-"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\threadproc\win32\proc.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_PROC_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -907,38 +953,9 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_PROC_=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_lock.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_portable.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_time.h"\
- ".\include\apr_win.h"\
- ".\threadproc\win32\threadproc.h"\
-
-
-"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\file_io\win32\readdir.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_READD=\
".\file_io\win32\readdir.h"\
- ".\include\apr_win.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -946,23 +963,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_READD=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\file_io\win32\readwrite.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_READW=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -983,29 +984,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_READW=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\file_io\win32\seek.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_SEEK_=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -1026,29 +1005,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_SEEK_=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\network_io\win32\sendrecv.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_SENDR=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1068,29 +1025,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_SENDR=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_win.h"\
- ".\network_io\win32\networkio.h"\
-
-
-"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\signal\win32\signal.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_SIGNA=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1108,27 +1043,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_SIGNA=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
-
-
-"$(INTDIR)\signal.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\threadproc\win32\signals.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_SIGNAL=\
".\file_io\win32\fileio.h"\
".\file_io\win32\readdir.h"\
@@ -1150,57 +1065,28 @@
"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNAL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_SIGNAL=\
- ".\file_io\win32\fileio.h"\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_win.h"\
- ".\threadproc\win32\threadproc.h"\
-
-
-"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNAL) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ENDIF
-
-SOURCE=.\network_io\win32\sockets.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
-DEP_CPP_SOCKE=\
+SOURCE=.\network_io\win32\sockaddr.c
+DEP_CPP_SOCKA=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
".\include\apr_general.h"\
".\include\apr_lib.h"\
- ".\include\apr_lock.h"\
".\include\apr_network_io.h"\
- ".\include\apr_portable.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SOCKE=\
+NODEP_CPP_SOCKA=\
".\include\apr_config.h"\
-"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
+SOURCE=.\network_io\win32\sockets.c
DEP_CPP_SOCKE=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1214,18 +1100,17 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_SOCKE=\
+ ".\include\apr_config.h"\
+
"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ENDIF
-
SOURCE=.\network_io\win32\sockopt.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_SOCKO=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1245,29 +1130,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_SOCKO=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_win.h"\
- ".\network_io\win32\networkio.h"\
-
-
-"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\misc\win32\start.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_START=\
".\file_io\win32\readdir.h"\
".\inc\apr_pools.h"\
@@ -1287,29 +1150,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_START=\
- ".\file_io\win32\readdir.h"\
- ".\inc\apr_pools.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_win.h"\
- ".\misc\win32\misc.h"\
-
-
-"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\threadproc\win32\thread.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_THREA=\
".\file_io\win32\readdir.h"\
".\include\apr_errno.h"\
@@ -1333,33 +1174,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_THREA=\
- ".\file_io\win32\readdir.h"\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_lib.h"\
- ".\include\apr_lock.h"\
- ".\include\apr_network_io.h"\
- ".\include\apr_portable.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_time.h"\
- ".\include\apr_win.h"\
- ".\threadproc\win32\threadproc.h"\
-
-
-"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\threadproc\win32\threadcancel.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
DEP_CPP_THREAD=\
".\include\apr_errno.h"\
".\include\apr_file_io.h"\
@@ -1376,23 +1191,6 @@
"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-DEP_CPP_THREAD=\
- ".\include\apr_errno.h"\
- ".\include\apr_file_io.h"\
- ".\include\apr_general.h"\
- ".\include\apr_thread_proc.h"\
- ".\include\apr_win.h"\
- ".\threadproc\win32\threadproc.h"\
-
-
-"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
SOURCE=.\threadproc\win32\threadpriv.c
DEP_CPP_THREADP=\
1.4 +4 -0 apache-2.0/src/lib/apr/aprlib.dsp
Index: aprlib.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aprlib.dsp 1999/10/05 04:19:21 1.3
+++ aprlib.dsp 1999/10/25 23:55:41 1.4
@@ -212,6 +212,10 @@
# End Source File
# Begin Source File
+SOURCE=.\network_io\win32\sockaddr.c
+# End Source File
+# Begin Source File
+
SOURCE=.\network_io\win32\sockets.c
# End Source File
# Begin Source File
1.5 +15 -4 apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aprlib.def 1999/10/17 01:37:54 1.4
+++ aprlib.def 1999/10/25 23:55:43 1.5
@@ -64,8 +64,8 @@
ap_send @56
ap_recv @57
ap_setsocketopt @58
- ap_getport @59
- ap_setport @60
+; ap_getport @59
+; ap_setport @60
ap_setup_poll @61
ap_poll @62
ap_add_poll_socket @63
@@ -78,8 +78,8 @@
ap_get_os_sock @70
ap_remove_poll_socket @71
ap_clear_poll_sockets @72
- ap_setipaddr @73
- ap_getipaddr @74
+; ap_setipaddr @73
+; ap_getipaddr @74
ap_create_signal @75
ap_setup_signal @76
SignalHandling @77
@@ -211,3 +211,14 @@
ap_ungetc @203
ap_tokenize_to_argv @204
ap_filename_of_pathname @205
+ ap_get_remote_name @206
+ ap_get_local_name @207
+ ap_get_local_ipaddr @208
+ ap_set_local_ipaddr @209
+ ap_get_remote_ipaddr @210
+ ap_set_remote_ipaddr @211
+ ap_get_local_port @212
+ ap_set_local_port @213
+ ap_get_remote_port @214
+ ap_set_remote_port @215
+
