Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Sender: jtc@orac.acorntoolworks.com
To: dev@apr.apache.org
Subject: [PATCH]: support for qnx6
Reply-To: jtc@acorntoolworks.com
From: jtc@acorntoolworks.com (J.T. Conklin)
Date: 11 Oct 2001 10:28:25 -0700
Message-ID: <87n12ym6h2.fsf@orac.acorntoolworks.com>
Lines: 56
User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.1 (Cuyahoga Valley)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

Enclosed are changes which add support for QNX 6 targets which I did
as part of porting subversion to that environment.

QNX 6 uses a different kernel (called neutrino) than the older QNX 4
product.  QNX 6 is posix complient and much more unix-like than it's 
predecessor.

This patch adds a entry to apr_hints.m4 that match *-nto-qnx* before
the existing *-qnx rule which is used for QNX 4.  It's a null entry,
as no special flaks or libraries need to be added.

The patch also expands the "ushort" in the union semun definition in
arch/unix/proc_mutex.h to "unsigned short", as QNX 6 doesn't define 
that type.

        --jtc

Index: build/apr_hints.m4
===================================================================
RCS file: /home/cvspublic/apr/build/apr_hints.m4,v
retrieving revision 1.23
diff -u -r1.23 apr_hints.m4
--- build/apr_hints.m4	2001/09/22 20:23:21	1.23
+++ build/apr_hints.m4	2001/10/10 18:05:49
@@ -168,6 +168,8 @@
     *-dec-osf*)
 	APR_ADDTO(CPPFLAGS, [-DOSF1])
 	;;
+    *-nto-qnx*)
+	;;
     *-qnx)
 	APR_ADDTO(CPPFLAGS, [-DQNX])
 	APR_ADDTO(LIBS, [-N128k -lunix])
Index: include/arch/unix/proc_mutex.h
===================================================================
RCS file: /home/cvspublic/apr/include/arch/unix/proc_mutex.h,v
retrieving revision 1.2
diff -u -r1.2 proc_mutex.h
--- include/arch/unix/proc_mutex.h	2001/09/24 05:41:56	1.2
+++ include/arch/unix/proc_mutex.h	2001/10/10 18:05:50
@@ -131,11 +131,11 @@
 
 
 #if !APR_HAVE_UNION_SEMUN && defined(APR_HAS_SYSVSEM_SERIALIZE)
-/* it makes no sense, but this isn't defined on solaris */
+/* it makes no sense, but this isn't defined on solaris or qnx6 */
 union semun {
     long val;
     struct semid_ds *buf;
-    ushort *array;
+    unsigned short *array;
 };
 #endif
 
-- 
J.T. Conklin