diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-22 07:11:29 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-22 07:11:29 +0000 |
commit | 57aa1e12c00cf6e926643d56ad61a6cec2503de1 (patch) | |
tree | 158be03737817cb972988a951185f580badb4572 | |
parent | 6bc1854003718dad4dafabaa7a8be64d78891d5a (diff) | |
download | libapr-57aa1e12c00cf6e926643d56ad61a6cec2503de1.tar.gz |
No actual global_mutex implementation on Win32, it's simply a proc_lock.
Same commit needed for Netware - though I don't that build structure.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63051 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | apr.dsp | 4 | ||||
-rw-r--r-- | libapr.dsp | 4 | ||||
-rw-r--r-- | locks/win32/global_mutex.c | 102 |
3 files changed, 0 insertions, 110 deletions
@@ -170,10 +170,6 @@ SOURCE=.\i18n\unix\xlate.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\locks\win32\global_mutex.c -# End Source File -# Begin Source File - SOURCE=.\locks\win32\locks.c # End Source File # Begin Source File diff --git a/libapr.dsp b/libapr.dsp index ea0c83686..abffb763f 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -176,10 +176,6 @@ SOURCE=.\i18n\unix\xlate.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\locks\win32\global_mutex.c -# End Source File -# Begin Source File - SOURCE=.\locks\win32\locks.c # End Source File # Begin Source File diff --git a/locks/win32/global_mutex.c b/locks/win32/global_mutex.c deleted file mode 100644 index 95e6e461c..000000000 --- a/locks/win32/global_mutex.c +++ /dev/null @@ -1,102 +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/>. - */ - -#include "apr.h" -#include "apr_lock.h" -#include "apr_strings.h" -#include "apr_global_mutex.h" -#include "proc_mutex.h" - -APR_DECLARE(apr_status_t) apr_global_mutex_create(apr_global_mutex_t **mutex, - const char *fname, - apr_lockmech_e mech, - apr_pool_t *pool) -{ - return apr_proc_mutex_create((apr_proc_mutex_t **) mutex, fname, mech, pool); -} - -APR_DECLARE(apr_status_t) apr_global_mutex_child_init( - apr_global_mutex_t **mutex, - const char *fname, - apr_pool_t *pool) -{ - return apr_proc_mutex_child_init((apr_proc_mutex_t**) mutex, fname, pool); -} - -APR_DECLARE(apr_status_t) apr_global_mutex_lock(apr_global_mutex_t *mutex) -{ - return apr_proc_mutex_lock((apr_proc_mutex_t*) mutex); -} - -APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex) -{ - return apr_proc_mutex_trylock((apr_proc_mutex_t* )mutex); -} - -APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex) -{ - return apr_proc_mutex_unlock((apr_proc_mutex_t*) mutex); -} - -APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex) -{ - return apr_proc_mutex_destroy((apr_proc_mutex_t*) mutex); -} - -APR_DECLARE(apr_pool_t*) apr_global_mutex_pool_get(const apr_global_mutex_t *mutex) -{ - return apr_proc_mutex_pool_get((apr_proc_mutex_t*) mutex); -} - - |