X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=3af6efb0e02eabbf7911808a3353948996aa97aa;hp=f540d7752ef897662a4fb30508b6fc5cb5414abd;hb=d572cb6c1c95c1371b9c1eb986d4736c53fa9f40;hpb=6da6a113310ed0e2002a34d2c2630e23e3c506fe

diff --git a/e_os.h b/e_os.h
index f540d7752e..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
@@ -404,10 +408,11 @@ extern HINSTANCE _hInstance;
 #endif
 
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
+  /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
 # define memmove(s1,s2,n) bcopy((s2),(s1),(n))
 # define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
 extern char *sys_errlist[]; extern int sys_nerr;
-#  define strerror(errnum) \
+# define strerror(errnum) \
 	(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
 #endif