stoddard 99/02/23 12:52:17
Modified: pthreads/src/include apr.h
pthreads/src Configure
Log:
Make this stuff compile and link on AIX 4.2.
Revision Changes Path
1.2 +77 -0 apache-apr/pthreads/src/include/apr.h
Index: apr.h
===================================================================
RCS file: /export/home/cvs/apache-apr/pthreads/src/include/apr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr.h 1999/01/21 23:08:32 1.1
+++ apr.h 1999/02/23 20:52:11 1.2
@@ -1 +1,78 @@
+/* ====================================================================
+ * Copyright (c) 1995-1999 The Apache Group. 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. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``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 GROUP 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 Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+#ifndef APR_H_
+#define APR_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define APRFile int
+
+/*
+ * Eventually, crap like the following will be abstracted out and
+ * pushed deep into APR...
+ */
+#ifdef AIX=42
+#define pthread_sigmask sigprocmask
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APR_H_ */
1.6 +4 -4 apache-apr/pthreads/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-apr/pthreads/src/Configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Configure 1999/02/22 07:36:00 1.5
+++ Configure 1999/02/23 20:52:15 1.6
@@ -302,13 +302,13 @@
;;
*-ibm-aix4.2)
OS='IBM AIX 4.2'
- CFLAGS="$CFLAGS -DAIX=42 -U__STR__ -lpthread"
- LDFLAGS="$LDFLAGS -lm"
+ CFLAGS="$CFLAGS -DAIX=42 -U__STR__"
+ LDFLAGS="$LDFLAGS -lm -lpthreads"
;;
*-ibm-aix4.3)
OS='IBM AIX 4.3'
- CFLAGS="$CFLAGS -DAIX=43 -U__STR__ -lpthread"
- LDFLAGS="$LDFLAGS -lm"
+ CFLAGS="$CFLAGS -DAIX=43 -U__STR__"
+ LDFLAGS="$LDFLAGS -lm -lpthreads"
;;
*-ibm-aix*)
OS='IBM AIX'
