projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify and fix ec_GFp_simple_points_make_affine
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 67638f75340e2668c692444d0c4da91f81398cf7..0a97895360d71407e2be33279641421728ac796e 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-311,7
+311,7
@@
static unsigned int _strlen31(const char *str)
# undef isxdigit
# endif
# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
# undef isxdigit
# endif
# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
-# if _MSC_VER>=1300
+# if _MSC_VER>=1300
&& _MSC_VER<1600
# undef stdin
# undef stdout
# undef stderr
# undef stdin
# undef stdout
# undef stderr
@@
-319,7
+319,7
@@
static unsigned int _strlen31(const char *str)
# define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2])
# define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2])
-# elif defined(I_CAN_LIVE_WITH_LNK4049)
+# elif
_MSC_VER<1300 &&
defined(I_CAN_LIVE_WITH_LNK4049)
# undef stdin
# undef stdout
# undef stderr
# undef stdin
# undef stdout
# undef stderr