Work around inconsistent version numbering in 0.9.8f (release).

[oweals/openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index e156b63394e77c88f757abb98d42087938c30066..ab3c539eab869ede1bb2b075f948d38d27dada76 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -277,6 +277,14 @@ static unsigned int _strlen31(const char *str)
        }
 #    endif
 #    include <malloc.h>
+#    if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace)
+       /* compensate for bug is VC6 ctype.h */
+#      undef isspace
+#      undef isdigit
+#      undef isalnum
+#      undef isupper
+#      undef isxdigit
+#    endif
 #  endif
 #  include <io.h>
 #  include <fcntl.h>
@@ -566,7 +574,7 @@ extern char *sys_errlist[]; extern int sys_nerr;
 # define strerror(errnum) \
        (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
   /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
-#include "o_str.h"
+#include "crypto/o_str.h"
 # define memcmp OPENSSL_memcmp
 #endif