From apache-cvs-return-2161-apmail-apache-cvs-archive=apache.org@apache.org Tue Jul 25 00:42:18 2000 Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 38221 invoked by uid 500); 25 Jul 2000 00:42:17 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 38210 invoked by uid 500); 25 Jul 2000 00:42:17 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 25 Jul 2000 00:42:17 -0000 Message-ID: <20000725004217.38206.qmail@locus.apache.org> From: wrowe@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c wrowe 00/07/24 17:42:15 Modified: src Apache.dsw src/lib/apr aprlib.dsp src/lib/apr/file_io/win32 dir.c filedup.c open.c pipe.c src/lib/apr/include apr_hash.h src/lib/apr/locks/win32 locks.c src/lib/apr/misc/win32 names.c src/lib/apr/network_io/win32 sockaddr.c sockopt.c src/lib/apr/threadproc/win32 proc.c Log: Changes to get Win32 compiling again, including substituting apr_string.h for apr_lib.h, fix some bad linkage declarations, and some more comments on threadproc/win32/proc.c Revision Changes Path 1.18 +6 -0 apache-2.0/src/Apache.dsw Index: Apache.dsw =================================================================== RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Apache.dsw 2000/07/11 11:59:33 1.17 +++ Apache.dsw 2000/07/25 00:42:09 1.18 @@ -344,6 +344,12 @@ Begin Project Dependency Project_Dep_Name ApacheCoreDll End Project Dependency + Begin Project Dependency + Project_Dep_Name pcreposix + End Project Dependency + Begin Project Dependency + Project_Dep_Name xmlparse + End Project Dependency }}} ############################################################################### 1.34 +120 -102 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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- aprlib.dsp 2000/06/10 17:15:38 1.33 +++ aprlib.dsp 2000/07/25 00:42:10 1.34 @@ -68,8 +68,8 @@ RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c +# 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 "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo @@ -93,23 +93,23 @@ # End Source File # Begin Source File -SOURCE=.\lib\apr_cpystrn.c +SOURCE=.\strings\apr_cpystrn.c # End Source File # Begin Source File -SOURCE=.\lib\apr_execve.c +SOURCE=.\strings\apr_fnmatch.c # End Source File # Begin Source File -SOURCE=.\lib\apr_fnmatch.c +SOURCE=.\passwd\apr_getpass.c # End Source File # Begin Source File -SOURCE=.\lib\apr_getpass.c +SOURCE=.\tables\apr_hash.c # End Source File # Begin Source File -SOURCE=.\lib\apr_md5.c +SOURCE=.\passwd\apr_md5.c # End Source File # Begin Source File @@ -117,19 +117,23 @@ # End Source File # Begin Source File -SOURCE=.\lib\apr_snprintf.c +SOURCE=.\lib\apr_signal.c # End Source File # Begin Source File -SOURCE=.\lib\apr_strnatcmp.c +SOURCE=.\strings\apr_snprintf.c # End Source File # Begin Source File -SOURCE=.\lib\apr_tables.c +SOURCE=.\strings\apr_strings.c # End Source File # Begin Source File -SOURCE=.\aprlib.def +SOURCE=.\strings\apr_strnatcmp.c +# End Source File +# Begin Source File + +SOURCE=.\tables\apr_tables.c # End Source File # Begin Source File @@ -209,6 +213,11 @@ # End Source File # Begin Source File +SOURCE=.\shmem\win32\shmem.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\threadproc\win32\signals.c # End Source File # Begin Source File @@ -244,191 +253,200 @@ SOURCE=.\time\win32\timestr.c # End Source File # End Group -# Begin Group "Header Files" +# Begin Group "Generated Header Files" -# PROP Default_Filter ".h" +# PROP Default_Filter "" # Begin Source File -SOURCE=.\include\apr_dso.h +SOURCE=.\include\apr.h # End Source File # Begin Source File -SOURCE=.\include\apr_errno.h +SOURCE=.\include\apr_private.h # End Source File +# End Group +# Begin Group "Internal Header Files" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\include\apr_file_io.h +SOURCE=.\include\apr_private.hw + +!IF "$(CFG)" == "aprlib - Win32 Release" + +# Begin Custom Build +InputPath=.\include\apr_private.hw + +".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\include\apr_private.hw .\include\apr_private.h > nul + echo Created apr_private.h from apr_private.hw + +# End Custom Build + +!ELSEIF "$(CFG)" == "aprlib - Win32 Debug" + +# Begin Custom Build +InputPath=.\include\apr_private.hw + +".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\include\apr_private.hw .\include\apr_private.h > nul + echo Created apr_private.h from apr_private.hw + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\include\apr_fnmatch.h +SOURCE=.\time\win32\atime.h # End Source File # Begin Source File -SOURCE=.\include\apr_general.h +SOURCE=.\dso\win32\dso.h # End Source File # Begin Source File -SOURCE=.\include\apr_getopt.h +SOURCE=.\file_io\win32\fileio.h # End Source File # Begin Source File -SOURCE=.\include\apr_lib.h +SOURCE=.\locks\win32\locks.h # End Source File # Begin Source File -SOURCE=.\include\apr_lock.h +SOURCE=.\misc\unix\misc.h # End Source File # Begin Source File -SOURCE=.\include\apr_md5.h +SOURCE=.\network_io\win32\networkio.h # End Source File # Begin Source File -SOURCE=.\include\apr_network_io.h +SOURCE=.\threadproc\win32\threadproc.h # End Source File +# End Group +# Begin Group "External Header Files" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\include\apr_pools.h +SOURCE=.\include\apr.h.in # End Source File # Begin Source File -SOURCE=.\include\apr_portable.h +SOURCE=.\include\apr.hw + +!IF "$(CFG)" == "aprlib - Win32 Release" + +# Begin Custom Build +InputPath=.\include\apr.hw + +".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\include\apr.hw .\include\apr.h > nul + echo Created apr.h from apr.hw + +# End Custom Build + +!ELSEIF "$(CFG)" == "aprlib - Win32 Debug" + +# Begin Custom Build +InputPath=.\include\apr.hw + +".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\include\apr.hw .\include\apr.h > nul + echo Created apr.h from apr.hw + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File -SOURCE=.\include\apr_shmem.h +SOURCE=.\include\apr_dso.h # End Source File # Begin Source File -SOURCE=.\include\apr_signal.h +SOURCE=.\include\apr_errno.h # End Source File # Begin Source File -SOURCE=.\include\apr_strnatcmp.h +SOURCE=.\include\apr_file_io.h # End Source File # Begin Source File -SOURCE=.\include\apr_tables.h +SOURCE=.\include\apr_fnmatch.h # End Source File # Begin Source File -SOURCE=.\include\apr_thread_proc.h +SOURCE=.\include\apr_general.h # End Source File # Begin Source File -SOURCE=.\include\apr_time.h +SOURCE=.\include\apr_getopt.h # End Source File # Begin Source File -SOURCE=.\include\apr_xlate.h +SOURCE=.\include\apr_hash.h # End Source File # Begin Source File -SOURCE=.\time\win32\atime.h +SOURCE=.\include\apr_lib.h # End Source File # Begin Source File -SOURCE=.\dso\win32\dso.h +SOURCE=.\include\apr_lock.h # End Source File # Begin Source File -SOURCE=.\file_io\win32\fileio.h +SOURCE=.\include\apr_md5.h # End Source File # Begin Source File -SOURCE=.\locks\win32\locks.h +SOURCE=.\include\apr_mmap.h # End Source File # Begin Source File -SOURCE=.\misc\unix\misc.h +SOURCE=.\include\apr_network_io.h # End Source File # Begin Source File -SOURCE=.\network_io\win32\networkio.h +SOURCE=.\include\apr_pools.h # End Source File # Begin Source File -SOURCE=.\threadproc\win32\threadproc.h +SOURCE=.\include\apr_portable.h # End Source File -# End Group -# Begin Group "Generated Header Files" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\include\apr.h +SOURCE=.\include\apr_shmem.h # End Source File # Begin Source File -SOURCE=.\include\apr_private.h +SOURCE=.\include\apr_strings.h # End Source File -# End Group -# Begin Group "Internal Header Files" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\include\apr_private.hw - -!IF "$(CFG)" == "aprlib - Win32 Release" - -# Begin Custom Build -InputPath=.\include\apr_private.hw - -".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\include\apr_private.hw .\include\apr_private.h > nul - echo Created apr_private.h from apr_private.hw - -# End Custom Build - -!ELSEIF "$(CFG)" == "aprlib - Win32 Debug" - -# Begin Custom Build -InputPath=.\include\apr_private.hw +SOURCE=.\include\apr_tables.h +# End Source File +# Begin Source File -".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\include\apr_private.hw .\include\apr_private.h > nul - echo Created apr_private.h from apr_private.hw - -# End Custom Build +SOURCE=.\include\apr_thread_proc.h +# End Source File +# Begin Source File -!ENDIF +SOURCE=.\include\apr_time.h +# End Source File +# Begin Source File +SOURCE=.\include\apr_xlate.h # End Source File # End Group -# Begin Group "External Header Files" - -# PROP Default_Filter "" # Begin Source File - -SOURCE=.\include\apr.hw -!IF "$(CFG)" == "aprlib - Win32 Release" - -# Begin Custom Build -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\include\apr.hw .\include\apr.h > nul - echo Created apr.h from apr.hw - -# End Custom Build - -!ELSEIF "$(CFG)" == "aprlib - Win32 Debug" - -# Begin Custom Build -InputPath=.\include\apr.hw - -".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy .\include\apr.hw .\include\apr.h > nul - echo Created apr.h from apr.hw - -# End Custom Build - -!ENDIF - +SOURCE=.\aprlib.def +# PROP Exclude_From_Build 1 # End Source File -# End Group # End Target # End Project 1.24 +1 -1 apache-2.0/src/lib/apr/file_io/win32/dir.c Index: dir.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dir.c 2000/06/22 16:05:28 1.23 +++ dir.c 2000/07/25 00:42:11 1.24 @@ -55,7 +55,7 @@ #include "apr.h" #include "fileio.h" #include "apr_file_io.h" -#include "apr_lib.h" +#include "apr_strings.h" #include "apr_portable.h" #include "atime.h" 1.19 +1 -1 apache-2.0/src/lib/apr/file_io/win32/filedup.c Index: filedup.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- filedup.c 2000/05/23 02:19:36 1.18 +++ filedup.c 2000/07/25 00:42:11 1.19 @@ -55,7 +55,7 @@ #include "fileio.h" #include "apr_file_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p) 1.45 +1 -1 apache-2.0/src/lib/apr/file_io/win32/open.c Index: open.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- open.c 2000/07/07 02:16:01 1.44 +++ open.c 2000/07/25 00:42:12 1.45 @@ -56,7 +56,7 @@ #include "fileio.h" #include "apr_file_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include "apr_portable.h" #include #include 1.25 +1 -1 apache-2.0/src/lib/apr/file_io/win32/pipe.c Index: pipe.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pipe.c 2000/07/03 03:21:11 1.24 +++ pipe.c 2000/07/25 00:42:12 1.25 @@ -55,7 +55,7 @@ #include "fileio.h" #include "apr_file_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include #include #include 1.6 +8 -7 apache-2.0/src/lib/apr/include/apr_hash.h Index: apr_hash.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_hash.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_hash.h 2000/07/23 04:52:59 1.5 +++ apr_hash.h 2000/07/25 00:42:12 1.6 @@ -84,7 +84,7 @@ * @param pool The pool to allocate the hash table out of * @return The hash table just created */ -ap_hash_t *ap_make_hash(ap_pool_t *pool); +APR_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool); /** * Associate a value with a key in a hash table. @@ -95,7 +95,8 @@ * @param val Value to associate with the key * @tip If the value is NULL the hash entry is deleted. */ -void ap_hash_set(ap_hash_t *ht, const void *key, size_t klen, const void *val); +APR_EXPORT(void) ap_hash_set(ap_hash_t *ht, const void *key, size_t klen, + const void *val); /** * Look up the value associated with a key in a hash table. @@ -105,7 +106,7 @@ * If the length is 0 it is assumed to be strlen(key)+1 * @return Returns NULL if the key is not present. */ -void *ap_hash_get(ap_hash_t *ht, const void *key, size_t klen); +APR_EXPORT(void) *ap_hash_get(ap_hash_t *ht, const void *key, size_t klen); /** * Start iterating over the entries in a hash table. @@ -132,14 +133,14 @@ * progress at the same time. * */ -ap_hash_index_t *ap_hash_first(ap_hash_t *ht); +APR_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht); /** * Continue iterating over the entries in a hash table. * @param hi The iteration state * @return a pointer to the updated iteration state. NULL if there are no more * entries. */ -ap_hash_index_t *ap_hash_next(ap_hash_index_t *hi); +APR_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi); /** * Get the current entry's details from the iteration state. @@ -150,8 +151,8 @@ * @tip The return pointers should point to a variable that will be set to the * corresponding data, or they may be NULL if the data isn't interesting. */ -void ap_hash_this(ap_hash_index_t *hi, const void **key, size_t *klen, - void **val); +APR_EXPORT(void) ap_hash_this(ap_hash_index_t *hi, const void **key, + size_t *klen, void **val); #ifdef __cplusplus } 1.29 +1 -1 apache-2.0/src/lib/apr/locks/win32/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- locks.c 2000/07/10 23:29:36 1.28 +++ locks.c 2000/07/25 00:42:13 1.29 @@ -53,7 +53,7 @@ */ #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include "locks.h" #include "apr_portable.h" 1.13 +1 -1 apache-2.0/src/lib/apr/misc/win32/names.c Index: names.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- names.c 2000/05/26 16:23:31 1.12 +++ names.c 2000/07/25 00:42:13 1.13 @@ -55,7 +55,7 @@ #include "apr_private.h" #include "apr_file_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include #include #include 1.9 +1 -1 apache-2.0/src/lib/apr/network_io/win32/sockaddr.c Index: sockaddr.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sockaddr.c 2000/06/26 20:37:46 1.8 +++ sockaddr.c 2000/07/25 00:42:13 1.9 @@ -55,7 +55,7 @@ #include "networkio.h" #include "apr_network_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include 1.21 +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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sockopt.c 2000/07/06 15:13:25 1.20 +++ sockopt.c 2000/07/25 00:42:14 1.21 @@ -55,7 +55,7 @@ #include "networkio.h" #include "apr_network_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include ap_status_t soblock(SOCKET sd) 1.34 +4 -1 apache-2.0/src/lib/apr/threadproc/win32/proc.c Index: proc.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- proc.c 2000/07/03 03:21:13 1.33 +++ proc.c 2000/07/25 00:42:14 1.34 @@ -58,7 +58,7 @@ #include "apr_thread_proc.h" #include "apr_file_io.h" #include "apr_general.h" -#include "apr_lib.h" +#include "apr_strings.h" #include "apr_portable.h" #include #include @@ -404,6 +404,9 @@ // The completion of the ap_proc_t type leaves us ill equiped to track both // the pid (Process ID) and handle to the process, which are entirely // different things and each useful in their own rights. + // + // Signals are broken since the hProcess varies from process to process, + // while the true process ID would not. new->pid = (pid_t) pi.hProcess; if (attr->child_in) {