summaryrefslogtreecommitdiff
path: root/locks/win32
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-11-09 06:25:30 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-11-09 06:25:30 +0000
commit12f7c162340e1cbd88dea13a8550576c2df901c7 (patch)
treebfcf4a7ea1a3d3774337b31b1dd1f584f067d5f5 /locks/win32
parent8825e536a947ba9d1aed9a653fe550edd65cd69b (diff)
downloadlibapr-12f7c162340e1cbd88dea13a8550576c2df901c7.tar.gz
Move all of the lock private header files to an arch directory under
the include directory. All private header files for APR are being moved. This allows platforms that only implement some of the APR types to compile cleanly. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60655 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks/win32')
-rw-r--r--locks/win32/locks.c2
-rw-r--r--locks/win32/locks.h70
2 files changed, 1 insertions, 71 deletions
diff --git a/locks/win32/locks.c b/locks/win32/locks.c
index e4d951cd1..67940bb5e 100644
--- a/locks/win32/locks.c
+++ b/locks/win32/locks.c
@@ -54,7 +54,7 @@
#include "apr_general.h"
#include "apr_strings.h"
-#include "locks.h"
+#include "win32/locks.h"
#include "apr_portable.h"
apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type,
diff --git a/locks/win32/locks.h b/locks/win32/locks.h
deleted file mode 100644
index a7515f238..000000000
--- a/locks/win32/locks.h
+++ /dev/null
@@ -1,70 +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/>.
- */
-
-#ifndef LOCKS_H
-#define LOCKS_H
-
-#include "apr_lock.h"
-
-struct apr_lock_t {
- apr_pool_t *cntxt;
- apr_locktype_e type;
- apr_lockscope_e scope;
- HANDLE mutex;
- CRITICAL_SECTION section;
- char *fname;
-};
-
-#endif /* LOCKS_H */
-