Loading CMakeLists.txt +11 −0 Original line number Original line Diff line number Diff line Loading @@ -783,6 +783,17 @@ else() set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) endif() endif() # TODO test which of these headers are required for the typedefs used in curlbuild.h if(WIN32) set(CURL_PULL_WS2TCPIP_H ${HAVE_WS2TCPIP_H}) else() set(CURL_PULL_SYS_TYPES_H ${HAVE_SYS_TYPES_H}) set(CURL_PULL_SYS_SOCKET_H ${HAVE_SYS_SOCKET_H}) set(CURL_PULL_SYS_POLL_H ${HAVE_SYS_POLL_H}) endif() set(CURL_PULL_STDINT_H ${HAVE_STDINT_H}) set(CURL_PULL_INTTYPES_H ${HAVE_INTTYPES_H}) include(CMake/OtherTests.cmake) include(CMake/OtherTests.cmake) add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H) Loading include/curl/curlbuild.h.cmake +51 −34 Original line number Original line Diff line number Diff line Loading @@ -71,6 +71,7 @@ #error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" #error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined #endif #endif #ifdef CURL_TYPEOF_CURL_OFF_T #ifdef CURL_TYPEOF_CURL_OFF_T #error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" #error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined Loading Loading @@ -110,71 +111,87 @@ /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ /* ================================================================ */ /* ================================================================ */ /* Configure process defines this to 1 when it finds out that system */ /* header file ws2tcpip.h must be included by the external interface. */ #cmakedefine CURL_PULL_WS2TCPIP_H #ifdef CURL_PULL_WS2TCPIP_H # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif # include <windows.h> # include <winsock2.h> # include <ws2tcpip.h> #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file sys/types.h must be included by the external interface. */ /* header file sys/types.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_TYPES_H ${CURL_PULL_SYS_TYPES_H} #cmakedefine CURL_PULL_SYS_TYPES_H #ifdef CURL_PULL_SYS_TYPES_H #ifdef CURL_PULL_SYS_TYPES_H # include <sys/types.h> # include <sys/types.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file stdint.h must be included by the external interface. */ /* header file stdint.h must be included by the external interface. */ #cmakedefine CURL_PULL_STDINT_H ${CURL_PULL_STDINT_H} #cmakedefine CURL_PULL_STDINT_H #ifdef CURL_PULL_STDINT_H #ifdef CURL_PULL_STDINT_H # include <stdint.h> # include <stdint.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file inttypes.h must be included by the external interface. */ /* header file inttypes.h must be included by the external interface. */ #cmakedefine CURL_PULL_INTTYPES_H ${CURL_PULL_INTTYPES_H} #cmakedefine CURL_PULL_INTTYPES_H #ifdef CURL_PULL_INTTYPES_H #ifdef CURL_PULL_INTTYPES_H # include <inttypes.h> # include <inttypes.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* header file sys/socket.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_SOCKET_H #ifdef CURL_PULL_SYS_SOCKET_H # include <sys/socket.h> #endif /* Configure process defines this to 1 when it finds out that system */ /* header file sys/poll.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_POLL_H #ifdef CURL_PULL_SYS_POLL_H # include <sys/poll.h> #endif /* The size of `long', as computed by sizeof. */ /* The size of `long', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} #define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} /* Integral data type used for curl_socklen_t. */ /* Integral data type used for curl_socklen_t. */ #cmakedefine CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} #define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} /* on windows socklen_t is in here */ #ifdef _WIN32 # include <winsock2.h> # include <ws2tcpip.h> #endif #ifdef HAVE_SYS_SOCKET_H /* The size of `curl_socklen_t', as computed by sizeof. */ # include <sys/socket.h> #define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} #endif /* Data type definition of curl_socklen_t. */ /* Data type definition of curl_socklen_t. */ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; /* The size of `curl_socklen_t', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} /* Signed integral data type used for curl_off_t. */ /* Signed integral data type used for curl_off_t. */ #cmakedefine CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} #define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} /* Data type definition of curl_off_t. */ /* Data type definition of curl_off_t. */ typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; /* curl_off_t formatting string directive without "%" conversion specifier. */ /* curl_off_t formatting string directive without "%" conversion specifier. */ #cmakedefine CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" #define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" /* unsigned curl_off_t formatting string without "%" conversion specifier. */ /* unsigned curl_off_t formatting string without "%" conversion specifier. */ #cmakedefine CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" #define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" /* curl_off_t formatting string directive with "%" conversion specifier. */ /* curl_off_t formatting string directive with "%" conversion specifier. */ #cmakedefine CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" #define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" /* The size of `curl_off_t', as computed by sizeof. */ /* The size of `curl_off_t', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} #define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} /* curl_off_t constant suffix. */ /* curl_off_t constant suffix. */ #cmakedefine CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} #define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} /* unsigned curl_off_t constant suffix. */ /* unsigned curl_off_t constant suffix. */ #cmakedefine CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} #define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} #endif /* __CURL_CURLBUILD_H */ #endif /* __CURL_CURLBUILD_H */ Loading
CMakeLists.txt +11 −0 Original line number Original line Diff line number Diff line Loading @@ -783,6 +783,17 @@ else() set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) endif() endif() # TODO test which of these headers are required for the typedefs used in curlbuild.h if(WIN32) set(CURL_PULL_WS2TCPIP_H ${HAVE_WS2TCPIP_H}) else() set(CURL_PULL_SYS_TYPES_H ${HAVE_SYS_TYPES_H}) set(CURL_PULL_SYS_SOCKET_H ${HAVE_SYS_SOCKET_H}) set(CURL_PULL_SYS_POLL_H ${HAVE_SYS_POLL_H}) endif() set(CURL_PULL_STDINT_H ${HAVE_STDINT_H}) set(CURL_PULL_INTTYPES_H ${HAVE_INTTYPES_H}) include(CMake/OtherTests.cmake) include(CMake/OtherTests.cmake) add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H) Loading
include/curl/curlbuild.h.cmake +51 −34 Original line number Original line Diff line number Diff line Loading @@ -71,6 +71,7 @@ #error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" #error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined #endif #endif #ifdef CURL_TYPEOF_CURL_OFF_T #ifdef CURL_TYPEOF_CURL_OFF_T #error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" #error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined Loading Loading @@ -110,71 +111,87 @@ /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ /* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ /* ================================================================ */ /* ================================================================ */ /* Configure process defines this to 1 when it finds out that system */ /* header file ws2tcpip.h must be included by the external interface. */ #cmakedefine CURL_PULL_WS2TCPIP_H #ifdef CURL_PULL_WS2TCPIP_H # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif # include <windows.h> # include <winsock2.h> # include <ws2tcpip.h> #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file sys/types.h must be included by the external interface. */ /* header file sys/types.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_TYPES_H ${CURL_PULL_SYS_TYPES_H} #cmakedefine CURL_PULL_SYS_TYPES_H #ifdef CURL_PULL_SYS_TYPES_H #ifdef CURL_PULL_SYS_TYPES_H # include <sys/types.h> # include <sys/types.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file stdint.h must be included by the external interface. */ /* header file stdint.h must be included by the external interface. */ #cmakedefine CURL_PULL_STDINT_H ${CURL_PULL_STDINT_H} #cmakedefine CURL_PULL_STDINT_H #ifdef CURL_PULL_STDINT_H #ifdef CURL_PULL_STDINT_H # include <stdint.h> # include <stdint.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* Configure process defines this to 1 when it finds out that system */ /* header file inttypes.h must be included by the external interface. */ /* header file inttypes.h must be included by the external interface. */ #cmakedefine CURL_PULL_INTTYPES_H ${CURL_PULL_INTTYPES_H} #cmakedefine CURL_PULL_INTTYPES_H #ifdef CURL_PULL_INTTYPES_H #ifdef CURL_PULL_INTTYPES_H # include <inttypes.h> # include <inttypes.h> #endif #endif /* Configure process defines this to 1 when it finds out that system */ /* header file sys/socket.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_SOCKET_H #ifdef CURL_PULL_SYS_SOCKET_H # include <sys/socket.h> #endif /* Configure process defines this to 1 when it finds out that system */ /* header file sys/poll.h must be included by the external interface. */ #cmakedefine CURL_PULL_SYS_POLL_H #ifdef CURL_PULL_SYS_POLL_H # include <sys/poll.h> #endif /* The size of `long', as computed by sizeof. */ /* The size of `long', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} #define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} /* Integral data type used for curl_socklen_t. */ /* Integral data type used for curl_socklen_t. */ #cmakedefine CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} #define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} /* on windows socklen_t is in here */ #ifdef _WIN32 # include <winsock2.h> # include <ws2tcpip.h> #endif #ifdef HAVE_SYS_SOCKET_H /* The size of `curl_socklen_t', as computed by sizeof. */ # include <sys/socket.h> #define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} #endif /* Data type definition of curl_socklen_t. */ /* Data type definition of curl_socklen_t. */ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; /* The size of `curl_socklen_t', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} /* Signed integral data type used for curl_off_t. */ /* Signed integral data type used for curl_off_t. */ #cmakedefine CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} #define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} /* Data type definition of curl_off_t. */ /* Data type definition of curl_off_t. */ typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; /* curl_off_t formatting string directive without "%" conversion specifier. */ /* curl_off_t formatting string directive without "%" conversion specifier. */ #cmakedefine CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" #define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" /* unsigned curl_off_t formatting string without "%" conversion specifier. */ /* unsigned curl_off_t formatting string without "%" conversion specifier. */ #cmakedefine CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" #define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" /* curl_off_t formatting string directive with "%" conversion specifier. */ /* curl_off_t formatting string directive with "%" conversion specifier. */ #cmakedefine CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" #define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" /* The size of `curl_off_t', as computed by sizeof. */ /* The size of `curl_off_t', as computed by sizeof. */ #cmakedefine CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} #define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} /* curl_off_t constant suffix. */ /* curl_off_t constant suffix. */ #cmakedefine CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} #define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} /* unsigned curl_off_t constant suffix. */ /* unsigned curl_off_t constant suffix. */ #cmakedefine CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} #define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} #endif /* __CURL_CURLBUILD_H */ #endif /* __CURL_CURLBUILD_H */
