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...@apache.org on 2003/02/16 11:07:54 UTC
cvs commit: apr/include apr.h.in apr.hw apr.hnw
wrowe 2003/02/16 02:07:54
Modified: include apr.h.in apr.hw apr.hnw
Log:
Several problems here; licenses were missing, and generally consistify
the several flavors of this file, ensuring we get identical (or at least,
preferably identical) results from doxygenation.
Revision Changes Path
1.119 +71 -1 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- apr.h.in 22 Jan 2003 18:25:59 -0000 1.118
+++ apr.h.in 16 Feb 2003 10:07:54 -0000 1.119
@@ -1,12 +1,81 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2003 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 APR_H
#define APR_H
+/* GENERATED FILE WARNING! DO NOT EDIT apr.h
+ *
+ * You must modify apr.h.in instead.
+ *
+ * And please, make an effort to stub apr.hw and apr.hnw in the process.
+ *
+ * This is the Win32 specific version of apr.h. It is copied from
+ * apr.hw when building the apr.dsp or libapr.dsp project. */
+
+
/**
* @file include/apr.h
* @brief APR APR Main Include
+ * @remark This is a generated header generated from include/apr.h.in by
+ * ./configure, or copied from include/apr.hw or include/apr.hnw
+ * for Win32 or Netware by those build environments, respectively.
*/
+
/**
- * @defgroup APR APR Routines
+ * @defgroup APR APR Functions
* @{
*/
@@ -320,4 +389,5 @@
#error no decision has been made on APR_PATH_MAX for your platform
#endif
/** @} */
+
#endif /* APR_H */
1.108 +24 -10 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- apr.hw 28 Jan 2003 21:11:22 -0000 1.107
+++ apr.hw 16 Feb 2003 10:07:54 -0000 1.108
@@ -53,22 +53,35 @@
*/
+#ifndef APR_H
+#define APR_H
+
+/* GENERATED FILE WARNING! DO NOT EDIT apr.h
+ *
+ * You must modify apr.hw instead.
+ *
+ * And please, make an effort to stub apr.hnw and apr.h.in in the process.
+ *
+ * This is the Win32 specific version of apr.h. It is copied from
+ * apr.hw by the apr.dsp and libapr.dsp projects.
+ */
+
+
/**
- * @file include\apr.h
+ * @file include/apr.h
* @brief Basic APR header for WIN32
- * @remark This is a Windows specific version of apr.h. It is copied as
- * apr.h at the start of a Windows build.
+ * @remark This is a generated header generated from include/apr.h.in by
+ * ./configure, or copied from include/apr.hw or include/apr.hnw
+ * for Win32 or Netware by those build environments, respectively.
*/
+#if defined(WIN32) || defined(DOXYGEN)
+
/**
- * @defgroup APR APR Functions (WIN32)
+ * @defgroup APR APR Functions
* @{
*/
-#ifdef WIN32
-#ifndef APR_H
-#define APR_H
-
/* Ignore most warnings (back down to /W3) for poorly constructed headers
*/
#if defined(_MSC_VER) && _MSC_VER >= 1200
@@ -492,7 +505,8 @@
#pragma warning(pop)
#endif
-#endif /* APR_H */
+/** @} */
#endif /* WIN32 */
-/** @} */
+
+#endif /* APR_H */
1.30 +22 -13 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apr.hnw 7 Feb 2003 17:58:45 -0000 1.29
+++ apr.hnw 16 Feb 2003 10:07:54 -0000 1.30
@@ -52,27 +52,35 @@
* <http://www.apache.org/>.
*/
-/*
- * Note: This is a NetWare specific version of apr.h. It is renamed to
- * apr.h at the start of a Windows build.
+
+#ifndef APR_H
+#define APR_H
+
+/* GENERATED FILE WARNING! DO NOT EDIT apr.h
+ *
+ * You must modify apr.hnw instead.
+ *
+ * And please, make an effort to stub apr.hw and apr.h.in in the process.
+ *
+ * This is the NetWare specific version of apr.h. It is copied from
+ * apr.hnw at the start of a NetWare build by prebuildNW.bat.
*/
-#ifdef NETWARE
+
/**
- * @file include\apr.h
- * @brief Basic APR header for NetWare
- * @remark This is a NetWare specific version of apr.h. It is copied as
- * apr.h at the start of a NetWare build through prebuildNW.bat.
+ * @file include/apr.h
+ * @brief APR APR Main Include
+ * @remark This is a generated header generated from include/apr.h.in by
+ * ./configure, or copied from include/apr.hw or include/apr.hnw
+ * for Win32 or Netware by those build environments, respectively.
*/
+#if defined(NETWARE) || defined(DOXYGEN)
+
/**
* @defgroup APR APR Functions
* @{
*/
-
-#ifndef APR_H
-#define APR_H
-
#include <sys/types.h>
#include <stddef.h>
#include <stdio.h>
@@ -338,7 +346,8 @@
#define APR_HAVE_INT64_STRFN 1
#define APR_INT64_STRFN strtoll
-#endif /* APR_H */
/** @} */
+
#endif /* NETWARE */
+#endif /* APR_H */