27 lines
760 B
Diff
27 lines
760 B
Diff
|
=== modified file 'crypto/bio/bio.h'
|
||
|
|
--- crypto/bio/bio.h 2013-02-08 14:43:05 +0000
|
||
|
|
+++ crypto/bio/bio.h 2013-02-08 14:43:26 +0000
|
||
|
|
@@ -752,7 +752,7 @@
|
||
|
|
|
||
|
|
/*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/
|
||
|
|
|
||
|
|
-#ifdef __GNUC__
|
||
|
|
+#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__MINGW64__)
|
||
|
|
# define __bio_h__attr__ __attribute__
|
||
|
|
#else
|
||
|
|
# define __bio_h__attr__(x)
|
||
|
|
|
||
|
|
=== modified file 'e_os.h'
|
||
|
|
--- e_os.h 2013-02-08 14:43:05 +0000
|
||
|
|
+++ e_os.h 2013-02-08 14:43:20 +0000
|
||
|
|
@@ -290,7 +290,7 @@
|
||
|
|
# ifdef _WIN64
|
||
|
|
# define strlen(s) _strlen31(s)
|
||
|
|
/* cut strings to 2GB */
|
||
|
|
-static unsigned int _strlen31(const char *str)
|
||
|
|
+static inline unsigned int _strlen31(const char *str)
|
||
|
|
{
|
||
|
|
unsigned int len=0;
|
||
|
|
while (*str && len<0x80000000U) str++, len++;
|
||
|
|
|