5 files changed, 35 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index bc77ece719..dde9f64a99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.5a and 0.9.6  [xx XXX 2000]
 
+  *) New Configure entry and patches for compiling on QNX 4.
+     [Andreas Schneider <andreas@ds3.etech.fh-hamburg.de>]
+
   *) A demo state-machine implementation was sponsored by
      Nuron (http://www.nuron.com/) and is now available in
      demos/state_machine.
diff --git a/Configure b/Configure
index 893540d64d..bbd752ed50 100755
--- a/Configure
+++ b/Configure
@@ -89,6 +89,8 @@ my $x86_elf_asm="asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:asm
 my $x86_out_asm="asm/bn86-out.o asm/co86-out.o:asm/dx86-out.o asm/yx86-out.o:asm/bx86-out.o:asm/mx86-out.o:asm/sx86-out.o:asm/cx86-out.o:asm/rx86-out.o:asm/rm86-out.o:asm/r586-out.o";
 my $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/bx86bsdi.o:asm/mx86bsdi.o:asm/sx86bsdi.o:asm/cx86bsdi.o:asm/rx86bsdi.o:asm/rm86bsdi.o:asm/r586bsdi.o";
 
+my $x86_omf_asm="asm/bn86-omf.o asm/co86-omf.o:asm/dx86-omf.o asm/yx86-omf.o:asm/bx86-omf.o:asm/mx86-omf.o:asm/sx86-omf.o:asm/cx86-omf.o:asm/rx86-omf.o:asm/rm86-omf.o:asm/r586-omf.o";
+
 # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1.
 # So the md5_locl.h file has an undef B_ENDIAN if sun is defined
 
@@ -294,6 +296,9 @@ my %table=(
 # NCR MP-RAS UNIX ver 02.03.01
 "ncr-scde","cc:-O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw::(unknown):-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:::",
 
+# QNX 4
+"qnx4",	"cc:-DL_ENDIAN -DTERMIO::::${x86_gcc_des} ${x86_gcc_opts}:${x86_omf_asm}",
+
 # Linux on ARM
 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC",
 
diff --git a/TABLE b/TABLE
index b4499fbb86..d0da34e292 100644
--- a/TABLE
+++ b/TABLE
@@ -1800,6 +1800,26 @@ $dso_scheme   =
 $shared_target= 
 $shared_cflag = 
 
+*** qnx4
+$cc           = cc
+$cflags       = -DL_ENDIAN -DTERMIO
+$unistd       = 
+$thread_cflag = 
+$lflags       = 
+$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$bn_obj       = asm/bn86-omf.o asm/co86-omf.o
+$des_obj      = asm/dx86-omf.o asm/yx86-omf.o
+$bf_obj       = asm/bx86-omf.o
+$md5_obj      = asm/mx86-omf.o
+$sha1_obj     = asm/sx86-omf.o
+$cast_obj     = asm/cx86-omf.o
+$rc4_obj      = asm/rx86-omf.o
+$rmd160_obj   = asm/rm86-omf.o
+$rc5_obj      = asm/r586-omf.o
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+
 *** rhapsody-ppc-cc
 $cc           = cc
 $cflags       = -O3 -DB_ENDIAN
diff --git a/config b/config
index b972c1fe29..af0686dff0 100755
--- a/config
+++ b/config
@@ -181,6 +181,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 
     QNX:*)
 	case "$VERSION" in
+	    425)
+		echo "${MACHINE}-qssl-qnx4"
+		;;
 	    423)
 		echo "${MACHINE}-qssl-qnx32"
 		;;
diff --git a/e_os.h b/e_os.h
index 487f0b2fb3..3af6efb0e0 100644
--- a/e_os.h
+++ b/e_os.h
@@ -363,6 +363,10 @@ extern HINSTANCE _hInstance;
 #      include <sys/select.h>
 #    endif
 
+#    ifdef __QNX__
+#      include <sys/select.h>
+#    endif
+
 #    if defined(sun)
 #      include <sys/filio.h>
 #    else