Fix. Build with cURL 7.19.7 (Ubuntu 10.04LTS)

This commit is contained in:
Alexey Melnichuk 2015-06-15 10:12:42 +04:00
parent d300c18b07
commit d85529586b

View File

@ -1,158 +1,163 @@
/* Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options */ /* Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options */
FLG_ENTRY(AUTH_NONE ) FLG_ENTRY(AUTH_NONE )
FLG_ENTRY(AUTH_BASIC ) FLG_ENTRY(AUTH_BASIC )
FLG_ENTRY(AUTH_DIGEST ) FLG_ENTRY(AUTH_DIGEST )
FLG_ENTRY(AUTH_GSSNEGOTIATE ) FLG_ENTRY(AUTH_GSSNEGOTIATE )
#if LCURL_CURL_VER_GE(7,38,0) #if LCURL_CURL_VER_GE(7,38,0)
FLG_ENTRY(AUTH_NEGOTIATE ) FLG_ENTRY(AUTH_NEGOTIATE )
#endif #endif
FLG_ENTRY(AUTH_NTLM ) FLG_ENTRY(AUTH_NTLM )
#if LCURL_CURL_VER_GE(7,19,3) #if LCURL_CURL_VER_GE(7,19,3)
FLG_ENTRY(AUTH_DIGEST_IE ) FLG_ENTRY(AUTH_DIGEST_IE )
#endif #endif
#if LCURL_CURL_VER_GE(7,22,0) #if LCURL_CURL_VER_GE(7,22,0)
FLG_ENTRY(AUTH_NTLM_WB ) FLG_ENTRY(AUTH_NTLM_WB )
#endif #endif
#if LCURL_CURL_VER_GE(7,21,3) #if LCURL_CURL_VER_GE(7,21,3)
FLG_ENTRY(AUTH_ONLY ) FLG_ENTRY(AUTH_ONLY )
#endif #endif
FLG_ENTRY(AUTH_ANY ) FLG_ENTRY(AUTH_ANY )
FLG_ENTRY(AUTH_ANYSAFE ) FLG_ENTRY(AUTH_ANYSAFE )
#ifdef CURLSSH_AUTH_ANY #ifdef CURLSSH_AUTH_ANY
FLG_ENTRY(SSH_AUTH_ANY ) FLG_ENTRY(SSH_AUTH_ANY )
#endif #endif
#ifdef CURLSSH_AUTH_NONE #ifdef CURLSSH_AUTH_NONE
FLG_ENTRY(SSH_AUTH_NONE ) FLG_ENTRY(SSH_AUTH_NONE )
#endif #endif
#ifdef CURLSSH_AUTH_PUBLICKEY #ifdef CURLSSH_AUTH_PUBLICKEY
FLG_ENTRY(SSH_AUTH_PUBLICKEY ) FLG_ENTRY(SSH_AUTH_PUBLICKEY )
#endif #endif
#ifdef CURLSSH_AUTH_PASSWORD #ifdef CURLSSH_AUTH_PASSWORD
FLG_ENTRY(SSH_AUTH_PASSWORD ) FLG_ENTRY(SSH_AUTH_PASSWORD )
#endif #endif
#ifdef CURLSSH_AUTH_HOST #ifdef CURLSSH_AUTH_HOST
FLG_ENTRY(SSH_AUTH_HOST ) FLG_ENTRY(SSH_AUTH_HOST )
#endif #endif
#ifdef CURLSSH_AUTH_KEYBOARD #ifdef CURLSSH_AUTH_KEYBOARD
FLG_ENTRY(SSH_AUTH_KEYBOARD ) FLG_ENTRY(SSH_AUTH_KEYBOARD )
#endif #endif
#ifdef CURLSSH_AUTH_AGENT #ifdef CURLSSH_AUTH_AGENT
FLG_ENTRY(SSH_AUTH_AGENT ) FLG_ENTRY(SSH_AUTH_AGENT )
#endif #endif
#ifdef CURLSSH_AUTH_DEFAULT #ifdef CURLSSH_AUTH_DEFAULT
FLG_ENTRY(SSH_AUTH_DEFAULT ) FLG_ENTRY(SSH_AUTH_DEFAULT )
#endif #endif
#ifdef CURLGSSAPI_DELEGATION_NONE
FLG_ENTRY(GSSAPI_DELEGATION_NONE ) FLG_ENTRY(GSSAPI_DELEGATION_NONE )
FLG_ENTRY(GSSAPI_DELEGATION_POLICY_FLAG ) #endif
FLG_ENTRY(GSSAPI_DELEGATION_FLAG ) #ifdef CURLGSSAPI_DELEGATION_POLICY_FLAG
FLG_ENTRY(GSSAPI_DELEGATION_POLICY_FLAG )
/* Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options */ #endif
FLG_ENTRY(USESSL_NONE ) #ifdef CURLGSSAPI_DELEGATION_FLAG
FLG_ENTRY(USESSL_TRY ) FLG_ENTRY(GSSAPI_DELEGATION_FLAG )
FLG_ENTRY(USESSL_CONTROL ) #endif
FLG_ENTRY(USESSL_ALL )
#ifdef CURLSSLOPT_ALLOW_BEAST /* Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options */
FLG_ENTRY(SSLOPT_ALLOW_BEAST ) FLG_ENTRY(USESSL_NONE )
#endif FLG_ENTRY(USESSL_TRY )
FLG_ENTRY(USESSL_CONTROL )
/* parameter for the CURLOPT_FTP_SSL_CCC option */ FLG_ENTRY(USESSL_ALL )
FLG_ENTRY(FTPSSL_CCC_NONE ) #ifdef CURLSSLOPT_ALLOW_BEAST
FLG_ENTRY(FTPSSL_CCC_PASSIVE ) FLG_ENTRY(SSLOPT_ALLOW_BEAST )
FLG_ENTRY(FTPSSL_CCC_ACTIVE ) #endif
/* parameter for the CURLOPT_FTPSSLAUTH option */ /* parameter for the CURLOPT_FTP_SSL_CCC option */
FLG_ENTRY(FTPAUTH_DEFAULT ) FLG_ENTRY(FTPSSL_CCC_NONE )
FLG_ENTRY(FTPAUTH_SSL ) FLG_ENTRY(FTPSSL_CCC_PASSIVE )
FLG_ENTRY(FTPAUTH_TLS ) FLG_ENTRY(FTPSSL_CCC_ACTIVE )
/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */ /* parameter for the CURLOPT_FTPSSLAUTH option */
FLG_ENTRY(FTP_CREATE_DIR_NONE ) FLG_ENTRY(FTPAUTH_DEFAULT )
FLG_ENTRY(FTP_CREATE_DIR ) FLG_ENTRY(FTPAUTH_SSL )
FLG_ENTRY(FTP_CREATE_DIR_RETRY ) FLG_ENTRY(FTPAUTH_TLS )
FLG_ENTRY(FTP_CREATE_DIR_LAST )
/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */
/* parameter for the CURLOPT_FTP_FILEMETHOD option */ FLG_ENTRY(FTP_CREATE_DIR_NONE )
FLG_ENTRY(FTPMETHOD_DEFAULT ) FLG_ENTRY(FTP_CREATE_DIR )
FLG_ENTRY(FTPMETHOD_MULTICWD ) FLG_ENTRY(FTP_CREATE_DIR_RETRY )
FLG_ENTRY(FTPMETHOD_NOCWD ) FLG_ENTRY(FTP_CREATE_DIR_LAST )
FLG_ENTRY(FTPMETHOD_SINGLECWD )
/* parameter for the CURLOPT_FTP_FILEMETHOD option */
/* bitmask defines for CURLOPT_HEADEROPT */ FLG_ENTRY(FTPMETHOD_DEFAULT )
#if LCURL_CURL_VER_GE(7,37,0) FLG_ENTRY(FTPMETHOD_MULTICWD )
FLG_ENTRY(HEADER_UNIFIED ) FLG_ENTRY(FTPMETHOD_NOCWD )
FLG_ENTRY(HEADER_SEPARATE ) FLG_ENTRY(FTPMETHOD_SINGLECWD )
#endif
/* bitmask defines for CURLOPT_HEADEROPT */
/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */ #if LCURL_CURL_VER_GE(7,37,0)
FLG_ENTRY(PROTO_HTTP ) FLG_ENTRY(HEADER_UNIFIED )
FLG_ENTRY(PROTO_HTTPS ) FLG_ENTRY(HEADER_SEPARATE )
FLG_ENTRY(PROTO_FTP ) #endif
FLG_ENTRY(PROTO_FTPS )
FLG_ENTRY(PROTO_SCP ) /* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
FLG_ENTRY(PROTO_SFTP ) FLG_ENTRY(PROTO_HTTP )
FLG_ENTRY(PROTO_TELNET ) FLG_ENTRY(PROTO_HTTPS )
FLG_ENTRY(PROTO_LDAP ) FLG_ENTRY(PROTO_FTP )
FLG_ENTRY(PROTO_LDAPS ) FLG_ENTRY(PROTO_FTPS )
FLG_ENTRY(PROTO_DICT ) FLG_ENTRY(PROTO_SCP )
FLG_ENTRY(PROTO_FILE ) FLG_ENTRY(PROTO_SFTP )
FLG_ENTRY(PROTO_TFTP ) FLG_ENTRY(PROTO_TELNET )
#ifdef CURLPROTO_IMAP FLG_ENTRY(PROTO_LDAP )
FLG_ENTRY(PROTO_IMAP ) FLG_ENTRY(PROTO_LDAPS )
#endif FLG_ENTRY(PROTO_DICT )
#ifdef CURLPROTO_IMAPS FLG_ENTRY(PROTO_FILE )
FLG_ENTRY(PROTO_IMAPS ) FLG_ENTRY(PROTO_TFTP )
#endif #ifdef CURLPROTO_IMAP
#ifdef CURLPROTO_POP3 FLG_ENTRY(PROTO_IMAP )
FLG_ENTRY(PROTO_POP3 ) #endif
#endif #ifdef CURLPROTO_IMAPS
#ifdef CURLPROTO_POP3S FLG_ENTRY(PROTO_IMAPS )
FLG_ENTRY(PROTO_POP3S ) #endif
#endif #ifdef CURLPROTO_POP3
#ifdef CURLPROTO_SMTP FLG_ENTRY(PROTO_POP3 )
FLG_ENTRY(PROTO_SMTP ) #endif
#endif #ifdef CURLPROTO_POP3S
#ifdef CURLPROTO_SMTPS FLG_ENTRY(PROTO_POP3S )
FLG_ENTRY(PROTO_SMTPS ) #endif
#endif #ifdef CURLPROTO_SMTP
#ifdef CURLPROTO_RTSP FLG_ENTRY(PROTO_SMTP )
FLG_ENTRY(PROTO_RTSP ) #endif
#endif #ifdef CURLPROTO_SMTPS
#ifdef CURLPROTO_RTMP FLG_ENTRY(PROTO_SMTPS )
FLG_ENTRY(PROTO_RTMP ) #endif
#endif #ifdef CURLPROTO_RTSP
#ifdef CURLPROTO_RTMPT FLG_ENTRY(PROTO_RTSP )
FLG_ENTRY(PROTO_RTMPT ) #endif
#endif #ifdef CURLPROTO_RTMP
#ifdef CURLPROTO_RTMPE FLG_ENTRY(PROTO_RTMP )
FLG_ENTRY(PROTO_RTMPE ) #endif
#endif #ifdef CURLPROTO_RTMPT
#ifdef CURLPROTO_RTMPTE FLG_ENTRY(PROTO_RTMPT )
FLG_ENTRY(PROTO_RTMPTE ) #endif
#endif #ifdef CURLPROTO_RTMPE
#ifdef CURLPROTO_RTMPS FLG_ENTRY(PROTO_RTMPE )
FLG_ENTRY(PROTO_RTMPS ) #endif
#endif #ifdef CURLPROTO_RTMPTE
#ifdef CURLPROTO_RTMPTS FLG_ENTRY(PROTO_RTMPTE )
FLG_ENTRY(PROTO_RTMPTS ) #endif
#endif #ifdef CURLPROTO_RTMPS
#ifdef CURLPROTO_GOPHER FLG_ENTRY(PROTO_RTMPS )
FLG_ENTRY(PROTO_GOPHER ) #endif
#endif #ifdef CURLPROTO_RTMPTS
FLG_ENTRY(PROTO_ALL ) FLG_ENTRY(PROTO_RTMPTS )
#endif
FLG_ENTRY(PROXY_HTTP ) /* added in 7.10.0 */ #ifdef CURLPROTO_GOPHER
FLG_ENTRY(PROXY_HTTP_1_0 ) /* added in 7.19.4 */ FLG_ENTRY(PROTO_GOPHER )
FLG_ENTRY(PROXY_SOCKS4 ) /* added in 7.15.2 */ #endif
FLG_ENTRY(PROXY_SOCKS5 ) /* added in 7.10.0 */ FLG_ENTRY(PROTO_ALL )
FLG_ENTRY(PROXY_SOCKS4A ) /* added in 7.18.0 */
FLG_ENTRY(PROXY_SOCKS5_HOSTNAME ) /* added in 7.18.0 */ FLG_ENTRY(PROXY_HTTP ) /* added in 7.10.0 */
FLG_ENTRY(PROXY_HTTP_1_0 ) /* added in 7.19.4 */
FLG_ENTRY(PAUSE_ALL ) /* added in 7.18.0 */ FLG_ENTRY(PROXY_SOCKS4 ) /* added in 7.15.2 */
FLG_ENTRY(PAUSE_CONT ) /* added in 7.18.0 */ FLG_ENTRY(PROXY_SOCKS5 ) /* added in 7.10.0 */
FLG_ENTRY(PAUSE_RECV ) /* added in 7.18.0 */ FLG_ENTRY(PROXY_SOCKS4A ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_RECV_CONT ) /* added in 7.18.0 */ FLG_ENTRY(PROXY_SOCKS5_HOSTNAME ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_SEND ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_SEND_CONT ) /* added in 7.18.0 */ FLG_ENTRY(PAUSE_ALL ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_CONT ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_RECV ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_RECV_CONT ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_SEND ) /* added in 7.18.0 */
FLG_ENTRY(PAUSE_SEND_CONT ) /* added in 7.18.0 */