generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smb: Disable SMB when 64-bit integers are not supported

Browse Source 
This fixes compilation issues with compilers that don't support 64-bit
integers through long long or __int64.
This commit is contained in:
Steve Holme 2014-12-12 22:08:03 +00:00
parent 82fdb87b27
commit 24b30d259c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/smb.c
View File

@ -22,7 +22,8 @@
#include "curl_setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(CURL_SIZEOF_CURL_OFF_T > 4)
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) #if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
@ -902,4 +903,4 @@ static CURLcode smb_parse_url_path(struct connectdata *conn)
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */ #endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* CURL_DISABLE_SMB && USE_NTLM */ #endif /* CURL_DISABLE_SMB && USE_NTLM && CURL_SIZEOF_CURL_OFF_T > 4 */

5
lib/smb.h
View File

@ -256,7 +256,8 @@ struct smb_tree_disconnect {
#endif /* BUILDING_CURL_SMB_C */ #endif /* BUILDING_CURL_SMB_C */
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(CURL_SIZEOF_CURL_OFF_T > 4)
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) #if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
@ -265,6 +266,6 @@ extern const struct Curl_handler Curl_handler_smbs;
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */ #endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* CURL_DISABLE_SMB && USE_NTLM */ #endif /* CURL_DISABLE_SMB && USE_NTLM && CURL_SIZEOF_CURL_OFF_T > 4 */
#endif /* HEADER_CURL_SMB_H */ #endif /* HEADER_CURL_SMB_H */

1
lib/url.c
View File

@ -221,6 +221,7 @@ static const struct Curl_handler * const protocols[] = {
#endif #endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(CURL_SIZEOF_CURL_OFF_T > 4) && \
(!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)) (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))
&Curl_handler_smb, &Curl_handler_smb,
#ifdef USE_SSL #ifdef USE_SSL

1
lib/version.c
View File

@ -217,6 +217,7 @@ static const char * const protocols[] = {
"sftp", "sftp",
#endif #endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(CURL_SIZEOF_CURL_OFF_T > 4) && \
(!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)) (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))
"smb", "smb",
# ifdef USE_SSL # ifdef USE_SSL