bel2125 7 роки тому
батько
коміт
56c5f77cf8
1 змінених файлів з 4 додано та 2 видалено
  1. 4 2
      src/civetweb.c

+ 4 - 2
src/civetweb.c

@@ -198,7 +198,7 @@ void __cyg_profile_func_exit(void *this_fn, void *call_site)
 void
 void
 __cyg_profile_func_enter(void *this_fn, void *call_site)
 __cyg_profile_func_enter(void *this_fn, void *call_site)
 {
 {
-	if (this_fn != printf) {
+	if ((void *)this_fn != (void *)printf) {
 		printf("E %p %p\n", this_fn, call_site);
 		printf("E %p %p\n", this_fn, call_site);
 	}
 	}
 }
 }
@@ -206,7 +206,7 @@ __cyg_profile_func_enter(void *this_fn, void *call_site)
 void
 void
 __cyg_profile_func_exit(void *this_fn, void *call_site)
 __cyg_profile_func_exit(void *this_fn, void *call_site)
 {
 {
-	if (this_fn != printf) {
+	if ((void *)this_fn != (void *)printf) {
 		printf("X %p %p\n", this_fn, call_site);
 		printf("X %p %p\n", this_fn, call_site);
 	}
 	}
 }
 }
@@ -1747,8 +1747,10 @@ typedef struct SSL_CTX SSL_CTX;
 
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
 /* If OpenSSL headers are included, automatically select the API version */
 /* If OpenSSL headers are included, automatically select the API version */
+#ifndef OPENSSL_API_1_1
 #define OPENSSL_API_1_1
 #define OPENSSL_API_1_1
 #endif
 #endif
+#endif
 
 
 
 
 #else
 #else