zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-13 00:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Define socklen_t in according to a feature test (#949)

Browse source 
Co-authored-by: KO Myung-Hun <komh@chollian.net>
This commit is contained in:
Tom M 2021-07-28 11:00:27 +02:00 committed by GitHub
parent ec6d563c39
commit 8e56188316
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -774,6 +774,18 @@ if ( enable-ipv6 )
endif ( HAVE_INETNTOP ) endif ( HAVE_INETNTOP )
endif ( enable-ipv6 ) endif ( enable-ipv6 )
unset ( HAVE_SOCKLEN_T CACHE )
set ( CMAKE_EXTRA_INCLUDE_FILES_SAVE ${CMAKE_EXTRA_INCLUDE_FILES} )
if ( WIN32 )
set ( CMAKE_EXTRA_INCLUDE_FILES "winsock2.h;ws2tcpip.h" )
else ( WIN32 )
set ( CMAKE_EXTRA_INCLUDE_FILES sys/socket.h )
endif ( WIN32 )
check_type_size ( socklen_t SOCKLEN_T )
set ( CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES_SAVE} )
if ( HAVE_SOCKLEN_T )
set ( HAVE_SOCKLEN_T 1 )
endif ( HAVE_SOCKLEN_T )
# General configuration file # General configuration file
configure_file ( ${CMAKE_SOURCE_DIR}/src/config.cmake configure_file ( ${CMAKE_SOURCE_DIR}/src/config.cmake

3
src/config.cmake
View file

@ -262,4 +262,7 @@
/* Define to 1 if you have the logf() function. */ /* Define to 1 if you have the logf() function. */
#cmakedefine HAVE_LOGF @HAVE_LOGF@ #cmakedefine HAVE_LOGF @HAVE_LOGF@
/* Define to 1 if you have the socklen_t type. */
#cmakedefine HAVE_SOCKLEN_T @HAVE_SOCKLEN_T@
#endif /* CONFIG_H */ #endif /* CONFIG_H */

3
src/utils/fluid_sys.h
View file

@ -205,8 +205,11 @@ char *fluid_strtok(char **str, char *delim);
#define INCL_DOS #define INCL_DOS
#include <os2.h> #include <os2.h>
/* Define socklen_t if not provided */
#if !HAVE_SOCKLEN_T
typedef int socklen_t; typedef int socklen_t;
#endif #endif
#endif
/** /**
Time functions Time functions