summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2007-10-13 12:38:37 +0000
committerAndy Polyakov <appro@openssl.org>2007-10-13 12:38:37 +0000
commit299e174d2d0d2333c7973b5430db9d4e998911b7 (patch)
tree42c8a27d5fda77a00026f2f26d771e1ad2f6678d /e_os.h
parentce62fc6eaede084a1b7f4a2ca1408fddc888478c (diff)
Make it possible to link VC static lib with either /MT or /MD application
[from HEAD]. PR: 1230
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/e_os.h b/e_os.h
index 5068d1bd74..ab3c539eab 100644
--- 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>