diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-06-17 11:38:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-06-17 11:38:26 +0000 |
| commit | 3492c47b18e901e9006b8ebb388640979d0342dd (patch) | |
| tree | 08599dc3a23d009ce8ee1ffd457b585450798f50 | |
| parent | 43dc001b6214fe9336a27c2ea32f7c1710a8688b (diff) | |
Update from HEAD.
| -rwxr-xr-x | Configure | 3 | ||||
| -rwxr-xr-x | config | 2 | ||||
| -rw-r--r-- | ssl/dtls1.h | 2 | ||||
| -rwxr-xr-x | util/shlib_wrap.sh | 2 |
4 files changed, 7 insertions, 2 deletions
@@ -400,7 +400,8 @@ my %table=( # QNX "qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:", -"qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:", +"QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"QNX6-i386", "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # BeOS "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", @@ -798,6 +798,8 @@ case "$GUESSOS" in j90-cray-unicos) OUT="cray-j90" ;; nsr-tandem-nsk) OUT="tandem-c89" ;; beos-*) OUT="$GUESSOS" ;; + x86pc-*-qnx6) OUT="QNX6-i386" ;; + *-*-qnx6) OUT="QNX6" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac diff --git a/ssl/dtls1.h b/ssl/dtls1.h index 9a0b511df6..f27362cad4 100644 --- a/ssl/dtls1.h +++ b/ssl/dtls1.h @@ -67,6 +67,8 @@ #include <winsock.h> #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) #include <sys/timeval.h> +#else +#include <sys/time.h> #endif #ifdef __cplusplus diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh index a2f62d696f..d744ff303d 100755 --- a/util/shlib_wrap.sh +++ b/util/shlib_wrap.sh @@ -80,7 +80,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then # it into a script makes it possible to do so on multi-ABI # platforms. case "$SYSNAME" in - *BSD) LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;; # *BSD + *BSD|QNX) LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;; # *BSD, QNX *) LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;; # SunOS, Linux, ELF HP-UX esac _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT" # Tru64, o32 IRIX |