abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-06 16:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1839 from mikecovlee/master

Browse Source 
[bugfix] fix win32 incompatible pointer type error and cmake warnings
This commit is contained in:
Zhi Guan
2025-12-08 20:42:24 +08:00
committed by GitHub
parent 74c6626c99 236590835a
commit 4ef98b0833
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
if (CMAKE_VERSION VERSION_LESS "3.0") if (CMAKE_VERSION VERSION_LESS "3.0")
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
else() else()
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.10)
endif() endif()
project(GmSSL C) project(GmSSL C)

2
include/gmssl/error.h
View File

@@ -30,7 +30,9 @@ extern "C" {
#ifndef DEBUG
#define DEBUG 1 #define DEBUG 1
#endif
#define warning_print() \ #define warning_print() \
do { if (DEBUG) fprintf(stderr, "%s:%d:%s():\n",__FILE__, __LINE__, __FUNCTION__); } while (0) do { if (DEBUG) fprintf(stderr, "%s:%d:%s():\n",__FILE__, __LINE__, __FUNCTION__); } while (0)

2
src/tls.c
View File

@@ -2321,7 +2321,7 @@ int tls_set_socket(TLS_CONNECT *conn, tls_socket_t sock)
{ {
int flags = 0; int flags = 0;
#ifdef WIN32 #ifdef WIN32
if( ioctlsocket(sock, FIONBIO, &flags) != 0) { if( ioctlsocket(sock, FIONBIO, (u_long*)&flags) != 0) {
error_puts("socket in non-blocking mode"); error_puts("socket in non-blocking mode");
//nginx will pass a socket in non-blocking mode //nginx will pass a socket in non-blocking mode
//return -1; //return -1;