X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=3af6efb0e02eabbf7911808a3353948996aa97aa;hp=95590a7cb2606be26e16638446e30de983ddae2c;hb=6dcbaf585709aae072f8b18236126fc3ca38a6ed;hpb=be5d92e01441e5f26ca4236f8d1e42ec37548f9e

diff --git a/e_os.h b/e_os.h
index 95590a7cb2..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,7 +408,12 @@ extern HINSTANCE _hInstance;
 #endif
 
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
-#define memmove(s1,s2,b) bcopy((s2),(s1),(n))
+  /* 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) \
+	(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
 #endif
 
 /***********************************************/