You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@locus.apache.org on 2000/12/08 17:10:34 UTC
cvs commit: apr-util/src/buckets ap_buckets_refcount.c
wrowe 00/12/08 08:10:33
Modified: . aprutil.dsp
include ap_buckets.h
src/buckets ap_buckets_refcount.c
Log:
Buckets build again on Win32
Revision Changes Path
1.6 +8 -13 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aprutil.dsp 2000/12/07 21:22:39 1.5
+++ aprutil.dsp 2000/12/08 16:10:27 1.6
@@ -43,14 +43,13 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR/apr-util" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibR\apr-util.lib"
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
@@ -69,14 +68,13 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"LibD/apr-util" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibD\apr-util.lib"
!ENDIF
@@ -110,13 +108,6 @@
# Begin Source File
SOURCE=.\src\buckets\ap_buckets_mmap.c
-
-!IF "$(CFG)" == "aprutil - Win32 Release"
-
-!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-
-!ENDIF
-
# End Source File
# Begin Source File
@@ -137,6 +128,10 @@
# Begin Source File
SOURCE=.\src\buckets\ap_buckets_socket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_util.c
# End Source File
# End Group
# Begin Group "crypto"
1.58 +1 -1 apr-util/include/ap_buckets.h
Index: ap_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/ap_buckets.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ap_buckets.h 2000/12/08 11:02:30 1.57
+++ ap_buckets.h 2000/12/08 16:10:29 1.58
@@ -888,7 +888,7 @@
or APR_SUCCESS
* @deffunc apr_status_t ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
*/
-APR_DECLARE(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
+APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
/* ***** Functions to Create Buckets of varying type ***** */
1.10 +1 -1 apr-util/src/buckets/ap_buckets_refcount.c
Index: ap_buckets_refcount.c
===================================================================
RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_refcount.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ap_buckets_refcount.c 2000/12/08 11:02:38 1.9
+++ ap_buckets_refcount.c 2000/12/08 16:10:31 1.10
@@ -86,7 +86,7 @@
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
+APR_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
{
ap_bucket *b;
ap_bucket_shared *ad, *bd;