diff options
| -rw-r--r-- | apr.mak | 80 | ||||
| -rw-r--r-- | include/arch/win32/misc.h | 177 | ||||
| -rw-r--r-- | libapr.mak | 81 | ||||
| -rw-r--r-- | threadproc/beos/threadcancel.c | 88 | ||||
| -rw-r--r-- | threadproc/os2/threadcancel.c | 85 | ||||
| -rw-r--r-- | threadproc/win32/threadcancel.c | 86 |
6 files changed, 127 insertions, 470 deletions
@@ -52,7 +52,6 @@ CLEAN : -@erase "$(INTDIR)\apr_hash.obj" -@erase "$(INTDIR)\apr_md5.obj" -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_signal.obj" -@erase "$(INTDIR)\apr_sms.obj" -@erase "$(INTDIR)\apr_sms_blocks.obj" -@erase "$(INTDIR)\apr_sms_std.obj" @@ -160,7 +159,6 @@ LIB32_OBJS= \ "$(INTDIR)\apr_hash.obj" \ "$(INTDIR)\apr_md5.obj" \ "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\apr_signal.obj" \ "$(INTDIR)\apr_sms.obj" \ "$(INTDIR)\apr_sms_blocks.obj" \ "$(INTDIR)\apr_sms_std.obj" \ @@ -244,7 +242,6 @@ CLEAN : -@erase "$(INTDIR)\apr_hash.obj" -@erase "$(INTDIR)\apr_md5.obj" -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_signal.obj" -@erase "$(INTDIR)\apr_sms.obj" -@erase "$(INTDIR)\apr_sms_blocks.obj" -@erase "$(INTDIR)\apr_sms_std.obj" @@ -352,7 +349,6 @@ LIB32_OBJS= \ "$(INTDIR)\apr_hash.obj" \ "$(INTDIR)\apr_md5.obj" \ "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\apr_signal.obj" \ "$(INTDIR)\apr_sms.obj" \ "$(INTDIR)\apr_sms_blocks.obj" \ "$(INTDIR)\apr_sms_std.obj" \ @@ -419,6 +415,7 @@ DEP_CPP_ACCES=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\arch\win32\apr_private.h"\ ".\include\arch\win32\atime.h"\ @@ -437,6 +434,7 @@ DEP_CPP_TIME_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -462,6 +460,7 @@ DEP_CPP_TIMES=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -486,6 +485,7 @@ DEP_CPP_APR_C=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -515,9 +515,11 @@ DEP_CPP_APR_S=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -537,6 +539,7 @@ DEP_CPP_APR_ST=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -552,6 +555,7 @@ DEP_CPP_APR_STR=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ @@ -565,6 +569,7 @@ DEP_CPP_APR_STRT=\ ".\include\apr.h"\ ".\include\apr_errno.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_want.h"\ @@ -580,6 +585,7 @@ DEP_CPP_APR_G=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -596,6 +602,7 @@ DEP_CPP_APR_M=\ ".\include\apr_lib.h"\ ".\include\apr_md5.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_xlate.h"\ ".\include\arch\win32\apr_private.h"\ @@ -613,6 +620,7 @@ DEP_CPP_APR_H=\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\arch\win32\apr_private.h"\ @@ -628,6 +636,7 @@ DEP_CPP_APR_T=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_tables.h"\ ".\include\arch\win32\apr_private.h"\ @@ -647,6 +656,7 @@ DEP_CPP_ERROR=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -676,6 +686,7 @@ DEP_CPP_GETOP=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -716,6 +727,7 @@ DEP_CPP_MISC_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -740,8 +752,10 @@ DEP_CPP_NAMES=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -763,6 +777,7 @@ DEP_CPP_OTHER=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -792,6 +807,7 @@ DEP_CPP_RAND_=\ ".\include\apr_errno.h"\ ".\include\apr_general.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\arch\win32\apr_private.h"\ @@ -808,6 +824,7 @@ DEP_CPP_START=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -849,6 +866,7 @@ DEP_CPP_DIR_C=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -881,6 +899,7 @@ DEP_CPP_FILEA=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -913,6 +932,7 @@ DEP_CPP_FILED=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -926,6 +946,7 @@ DEP_CPP_FILED=\ ".\include\apr_want.h"\ ".\include\apr_xlate.h"\ ".\include\arch\unix\i18n.h"\ + ".\include\arch\unix\inherit.h"\ ".\include\arch\unix\misc.h"\ ".\include\arch\win32\apr_private.h"\ ".\include\arch\win32\fileio.h"\ @@ -945,6 +966,7 @@ DEP_CPP_FILEP=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -977,6 +999,7 @@ DEP_CPP_FILES=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1010,6 +1033,7 @@ DEP_CPP_FLOCK=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1038,7 +1062,9 @@ DEP_CPP_FULLR=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1058,6 +1084,7 @@ DEP_CPP_OPEN_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1089,6 +1116,7 @@ DEP_CPP_PIPE_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1120,6 +1148,7 @@ DEP_CPP_READW=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1154,6 +1183,7 @@ DEP_CPP_SEEK_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1183,6 +1213,7 @@ DEP_CPP_LOCKS=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1209,8 +1240,10 @@ DEP_CPP_INET_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1231,8 +1264,10 @@ DEP_CPP_INET_P=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1252,9 +1287,11 @@ DEP_CPP_POLL_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1275,6 +1312,7 @@ DEP_CPP_SENDR=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1306,9 +1344,11 @@ DEP_CPP_SOCKA=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1330,6 +1370,7 @@ DEP_CPP_SOCKE=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1355,8 +1396,10 @@ DEP_CPP_SOCKO=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1378,6 +1421,7 @@ DEP_CPP_PROC_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1410,6 +1454,7 @@ DEP_CPP_SIGNA=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1441,6 +1486,7 @@ DEP_CPP_THREA=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1468,6 +1514,7 @@ DEP_CPP_THREAD=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1496,6 +1543,7 @@ DEP_CPP_DSO_C=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1519,24 +1567,12 @@ DEP_CPP_DSO_C=\ $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=.\lib\apr_signal.c -DEP_CPP_APR_SI=\ - ".\include\apr.h"\ - ".\include\apr_errno.h"\ - ".\include\apr_lib.h"\ - ".\include\arch\win32\apr_private.h"\ - - -"$(INTDIR)\apr_signal.obj" : $(SOURCE) $(DEP_CPP_APR_SI) "$(INTDIR)"\ - ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - SOURCE=.\i18n\unix\utf8_ucs2.c DEP_CPP_UTF8_=\ ".\include\apr.h"\ ".\include\apr_errno.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_xlate.h"\ ".\include\arch\unix\i18n.h"\ @@ -1554,8 +1590,10 @@ DEP_CPP_COMMO=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_mmap.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1576,6 +1614,7 @@ DEP_CPP_MMAP_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_mmap.h"\ ".\include\apr_network_io.h"\ @@ -1605,6 +1644,7 @@ DEP_CPP_GROUP=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1632,6 +1672,7 @@ DEP_CPP_USERI=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1664,6 +1705,7 @@ DEP_CPP_APR_P=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1692,6 +1734,7 @@ DEP_CPP_APR_SM=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1718,6 +1761,7 @@ DEP_CPP_APR_SMS=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1744,6 +1788,7 @@ DEP_CPP_APR_SMS_=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1770,6 +1815,7 @@ DEP_CPP_APR_SMS_T=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h deleted file mode 100644 index e896f1224..000000000 --- a/include/arch/win32/misc.h +++ /dev/null @@ -1,177 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2001 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/>. - */ - -#ifndef MISC_H -#define MISC_H - -#include "apr.h" -#include "apr_portable.h" -#include "apr_private.h" -#include "apr_general.h" -#include "apr_pools.h" -#include "apr_getopt.h" -#include "apr_thread_proc.h" -#include "apr_file_io.h" -#include "apr_errno.h" -#include "apr_getopt.h" - -#if APR_HAVE_STDIO_H -#include <stdio.h> -#endif -#if APR_HAVE_SIGNAL_H -#include <signal.h> -#endif -#if APR_HAVE_PTHREAD_H -#include <pthread.h> -#endif - -/* ### create APR_HAVE_* macros for these? */ -#if APR_HAVE_STDLIB_H -#include <stdlib.h> -#endif -#if APR_HAVE_STRING_H -#include <string.h> -#endif - -#ifdef BEOS -#include <kernel/OS.h> -#endif - -struct apr_other_child_rec_t { - apr_pool_t *p; - struct apr_other_child_rec_t *next; - int id; /* This is either a pid or tid depending on the platform */ - void (*maintenance) (int, void *, int); - void *data; - apr_os_file_t write_fd; -}; - -#ifdef WIN32 -#define WSAHighByte 2 -#define WSALowByte 0 -/* Platform specific designation of run time os version. - * Gaps allow for specific service pack levels that - * export new kernel or winsock functions or behavior. - */ -typedef enum { - APR_WIN_95 = 0, - APR_WIN_98 = 4, - APR_WIN_NT = 8, - APR_WIN_NT_4 = 12, - APR_WIN_NT_4_SP2 = 14, - APR_WIN_NT_4_SP3 = 15, - APR_WIN_NT_4_SP4 = 16, - APR_WIN_NT_4_SP6 = 18, - APR_WIN_2000 = 24 -} apr_oslevel_e; - - -typedef enum { - DLL_WINBASEAPI = 0, // kernel32 From WinBase.h - DLL_WINADVAPI = 1, // advapi32 From WinBase.h - DLL_WINSOCKAPI = 2, // mswsock From WinSock.h - DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h - DLL_defined = 4 // must define as last idx_ + 1 -} apr_dlltoken_e; - -FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal); - -/* The apr_load_dll_func call WILL fault if the function cannot be loaded */ - -#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ - typedef rettype (calltype *apr_winapi_fpt_##fn) args; \ - static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \ - __inline rettype apr_winapi_##fn args \ - { if (!apr_winapi_pfn_##fn) \ - apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \ - apr_load_dll_func(lib, #fn, ord); \ - return (*(apr_winapi_pfn_##fn)) names; }; \ - -/* Provide late bound declarations of every API function missing from - * one or more supported releases of the Win32 API - * - * lib is the enumerated token from apr_dlltoken_e, and must correspond - * to the string table entry in start.c used by the apr_load_dll_func(). - * Token names (attempt to) follow Windows.h declarations prefixed by DLL_ - * in order to facilitate comparison. Use the exact declaration syntax - * and names from Windows.h to prevent ambigutity and bugs. - * - * rettype and calltype follow the original declaration in Windows.h - * fn is the true function name - beware Ansi/Unicode #defined macros - * ord is the ordinal within the library, use 0 if it varies between versions - * args is the parameter list following the original declaration, in parens - * names is the parameter list sans data types, enclosed in parens - * - * #undef/re#define the Ansi/Unicode generic name to abate confusion - * In the case of non-text functions, simply #define the original name - */ - -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, ( - IN LPCSTR lpFileName, - IN GET_FILEEX_INFO_LEVELS fInfoLevelId, - OUT LPVOID lpFileInformation), - (lpFileName, fInfoLevelId, lpFileInformation)); -#undef GetFileAttributesEx -#define GetFileAttributesEx apr_winapi_GetFileAttributesExA - -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( - IN HANDLE hFile), - (hFile)); -#define CancelIo apr_winapi_CancelIo - -apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *); -#endif /* WIN32 */ - -#endif /* ! MISC_H */ - diff --git a/libapr.mak b/libapr.mak index b8a6fdc58..4ef6c31c4 100644 --- a/libapr.mak +++ b/libapr.mak @@ -52,7 +52,6 @@ CLEAN : -@erase "$(INTDIR)\apr_hash.obj" -@erase "$(INTDIR)\apr_md5.obj" -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_signal.obj" -@erase "$(INTDIR)\apr_sms.obj" -@erase "$(INTDIR)\apr_sms_blocks.obj" -@erase "$(INTDIR)\apr_sms_std.obj" @@ -169,7 +168,6 @@ LINK32_OBJS= \ "$(INTDIR)\apr_hash.obj" \ "$(INTDIR)\apr_md5.obj" \ "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\apr_signal.obj" \ "$(INTDIR)\apr_sms.obj" \ "$(INTDIR)\apr_sms_blocks.obj" \ "$(INTDIR)\apr_sms_std.obj" \ @@ -254,7 +252,6 @@ CLEAN : -@erase "$(INTDIR)\apr_hash.obj" -@erase "$(INTDIR)\apr_md5.obj" -@erase "$(INTDIR)\apr_pools.obj" - -@erase "$(INTDIR)\apr_signal.obj" -@erase "$(INTDIR)\apr_sms.obj" -@erase "$(INTDIR)\apr_sms_blocks.obj" -@erase "$(INTDIR)\apr_sms_std.obj" @@ -372,7 +369,6 @@ LINK32_OBJS= \ "$(INTDIR)\apr_hash.obj" \ "$(INTDIR)\apr_md5.obj" \ "$(INTDIR)\apr_pools.obj" \ - "$(INTDIR)\apr_signal.obj" \ "$(INTDIR)\apr_sms.obj" \ "$(INTDIR)\apr_sms_blocks.obj" \ "$(INTDIR)\apr_sms_std.obj" \ @@ -440,6 +436,7 @@ DEP_CPP_ACCES=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\arch\win32\apr_private.h"\ ".\include\arch\win32\atime.h"\ @@ -458,6 +455,7 @@ DEP_CPP_TIME_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -483,6 +481,7 @@ DEP_CPP_TIMES=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -507,6 +506,7 @@ DEP_CPP_APR_C=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -536,9 +536,11 @@ DEP_CPP_APR_S=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -558,6 +560,7 @@ DEP_CPP_APR_ST=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -573,6 +576,7 @@ DEP_CPP_APR_STR=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ @@ -586,6 +590,7 @@ DEP_CPP_APR_STRT=\ ".\include\apr.h"\ ".\include\apr_errno.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_want.h"\ @@ -601,6 +606,7 @@ DEP_CPP_APR_G=\ ".\include\apr_errno.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\arch\win32\apr_private.h"\ @@ -617,6 +623,7 @@ DEP_CPP_APR_M=\ ".\include\apr_lib.h"\ ".\include\apr_md5.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_xlate.h"\ ".\include\arch\win32\apr_private.h"\ @@ -634,6 +641,7 @@ DEP_CPP_APR_H=\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\arch\win32\apr_private.h"\ @@ -649,6 +657,7 @@ DEP_CPP_APR_T=\ ".\include\apr_general.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_tables.h"\ ".\include\arch\win32\apr_private.h"\ @@ -668,6 +677,7 @@ DEP_CPP_ERROR=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -697,6 +707,7 @@ DEP_CPP_GETOP=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -737,6 +748,7 @@ DEP_CPP_MISC_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -761,8 +773,10 @@ DEP_CPP_NAMES=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -784,6 +798,7 @@ DEP_CPP_OTHER=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -813,6 +828,7 @@ DEP_CPP_RAND_=\ ".\include\apr_errno.h"\ ".\include\apr_general.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\arch\win32\apr_private.h"\ @@ -829,6 +845,7 @@ DEP_CPP_START=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -870,6 +887,7 @@ DEP_CPP_DIR_C=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -902,6 +920,7 @@ DEP_CPP_FILEA=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -934,6 +953,7 @@ DEP_CPP_FILED=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -947,6 +967,7 @@ DEP_CPP_FILED=\ ".\include\apr_want.h"\ ".\include\apr_xlate.h"\ ".\include\arch\unix\i18n.h"\ + ".\include\arch\unix\inherit.h"\ ".\include\arch\unix\misc.h"\ ".\include\arch\win32\apr_private.h"\ ".\include\arch\win32\fileio.h"\ @@ -966,6 +987,7 @@ DEP_CPP_FILEP=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -998,6 +1020,7 @@ DEP_CPP_FILES=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1031,6 +1054,7 @@ DEP_CPP_FLOCK=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1059,7 +1083,9 @@ DEP_CPP_FULLR=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1079,6 +1105,7 @@ DEP_CPP_OPEN_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1110,6 +1137,7 @@ DEP_CPP_PIPE_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1141,6 +1169,7 @@ DEP_CPP_READW=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1175,6 +1204,7 @@ DEP_CPP_SEEK_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1204,6 +1234,7 @@ DEP_CPP_LOCKS=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1230,8 +1261,10 @@ DEP_CPP_INET_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1252,8 +1285,10 @@ DEP_CPP_INET_P=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1273,9 +1308,11 @@ DEP_CPP_POLL_=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1296,6 +1333,7 @@ DEP_CPP_SENDR=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1327,9 +1365,11 @@ DEP_CPP_SOCKA=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1351,6 +1391,7 @@ DEP_CPP_SOCKE=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1376,8 +1417,10 @@ DEP_CPP_SOCKO=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_strings.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ @@ -1399,6 +1442,7 @@ DEP_CPP_PROC_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1431,6 +1475,7 @@ DEP_CPP_SIGNA=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1462,6 +1507,7 @@ DEP_CPP_THREA=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1489,6 +1535,7 @@ DEP_CPP_THREAD=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1517,6 +1564,7 @@ DEP_CPP_DSO_C=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1540,24 +1588,12 @@ DEP_CPP_DSO_C=\ $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=.\lib\apr_signal.c -DEP_CPP_APR_SI=\ - ".\include\apr.h"\ - ".\include\apr_errno.h"\ - ".\include\apr_lib.h"\ - ".\include\arch\win32\apr_private.h"\ - - -"$(INTDIR)\apr_signal.obj" : $(SOURCE) $(DEP_CPP_APR_SI) "$(INTDIR)"\ - ".\include\apr.h" - $(CPP) $(CPP_PROJ) $(SOURCE) - - SOURCE=.\i18n\unix\utf8_ucs2.c DEP_CPP_UTF8_=\ ".\include\apr.h"\ ".\include\apr_errno.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_xlate.h"\ ".\include\arch\unix\i18n.h"\ @@ -1575,8 +1611,10 @@ DEP_CPP_COMMO=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_mmap.h"\ ".\include\apr_pools.h"\ + ".\include\apr_sms.h"\ ".\include\apr_time.h"\ ".\include\apr_user.h"\ ".\include\apr_want.h"\ @@ -1597,6 +1635,7 @@ DEP_CPP_MMAP_=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_mmap.h"\ ".\include\apr_network_io.h"\ @@ -1626,6 +1665,7 @@ DEP_CPP_GROUP=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1653,6 +1693,7 @@ DEP_CPP_USERI=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_getopt.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1685,6 +1726,7 @@ DEP_CPP_APR_P=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lib.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ @@ -1713,6 +1755,7 @@ DEP_CPP_APR_SM=\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ ".\include\apr_hash.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1739,6 +1782,7 @@ DEP_CPP_APR_SMS=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1765,6 +1809,7 @@ DEP_CPP_APR_SMS_=\ ".\include\apr_errno.h"\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1791,6 +1836,7 @@ DEP_CPP_APR_SMS_T=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ @@ -1818,6 +1864,7 @@ DEP_CPP_APR_SMS_TR=\ ".\include\apr_file_info.h"\ ".\include\apr_file_io.h"\ ".\include\apr_general.h"\ + ".\include\apr_inherit.h"\ ".\include\apr_lock.h"\ ".\include\apr_network_io.h"\ ".\include\apr_pools.h"\ diff --git a/threadproc/beos/threadcancel.c b/threadproc/beos/threadcancel.c deleted file mode 100644 index 94a7e9407..000000000 --- a/threadproc/beos/threadcancel.c +++ /dev/null @@ -1,88 +0,0 @@ -/* ==================================================================== - * 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 "threadproc.h" - - -ap_status_t ap_cancel_thread(ap_thread_t *thd) -{ - if (kill_thread(thd->td) == 0) { - return APR_SUCCESS; - } - else { - return errno; - } -} - - -ap_status_t ap_setcanceltype(ap_int32_t type, ap_pool_t *cont) -{ -/* if (pthread_setcanceltype(type, NULL) == 0) {*/ - return APR_SUCCESS; -/* } - else { - return APR_FAILURE; - }*/ -} - -ap_status_t ap_setcancelstate(ap_int32_t type, ap_pool_t *cont) -{ -/* if (pthread_setcanceltype(type, NULL) == 0) {*/ - return APR_SUCCESS; -/* } - else { - return APR_FAILURE; - }*/ -} - diff --git a/threadproc/os2/threadcancel.c b/threadproc/os2/threadcancel.c deleted file mode 100644 index ca7a18753..000000000 --- a/threadproc/os2/threadcancel.c +++ /dev/null @@ -1,85 +0,0 @@ -/* ==================================================================== - * 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 "threadproc.h" -#include "apr_thread_proc.h" -#include "apr_general.h" -#include "fileio.h" - -ap_status_t ap_cancel_thread(ap_thread_t *thd) -{ - return APR_OS2_STATUS(DosKillThread(thd->tid)); -} - - - -ap_status_t ap_setcanceltype(ap_int32_t type, ap_pool_t *cont) -{ - ULONG rc, nesting; - - if (type == APR_CANCEL_DEFER) - rc = DosEnterMustComplete(&nesting); - else - rc = DosExitMustComplete(&nesting); - - return APR_OS2_STATUS(rc); -} - - - -ap_status_t ap_setcancelstate(ap_int32_t type, ap_pool_t *cont) -{ -/* There's no way to ignore thread kills altogether in OS/2 (that I know of) */ - return APR_ENOTIMPL; -} diff --git a/threadproc/win32/threadcancel.c b/threadproc/win32/threadcancel.c deleted file mode 100644 index 3a509202b..000000000 --- a/threadproc/win32/threadcancel.c +++ /dev/null @@ -1,86 +0,0 @@ -/* ==================================================================== - * 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 "threadproc.h" -#include "apr_thread_proc.h" -#include "apr_general.h" - - -ap_status_t ap_cancel_thread(ap_thread_t *thd) -{ - if (TerminateThread(thd->td, APR_SUCCESS) == 0) { - return APR_EEXIST; - } - else { - return APR_SUCCESS; - } -} - -/* Not sure of the best way to do this just yet. -ap_status_t ap_setcanceltype(ap_int32_t type, ap_pool_t *cont) -{ - -} - -ap_status_t ap_setcancelstate(ap_int32_t type, ap_pool_t *cont) -{ - ap_status_t stat; - if ((stat = pthread_setcanceltype(type, NULL)) == 0) { - return APR_SUCCESS; - } - else { - return stat; - } -} -*/ |