Commit 24b30d25 authored by Steve Holme's avatar Steve Holme
Browse files

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

This fixes compilation issues with compilers that don't support 64-bit
integers through long long or __int64.
parent 82fdb87b

lib/smb.c

+3 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


#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)
@@ -902,4 +903,4 @@ static CURLcode smb_parse_url_path(struct connectdata *conn) 


#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 */

lib/smb.h

+3 −2
Original line number Diff line number Diff line
@@ -256,7 +256,8 @@ struct smb_tree_disconnect { 


#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)
@@ -265,6 +266,6 @@ extern const struct Curl_handler Curl_handler_smbs; 


#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 */

lib/url.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static const struct Curl_handler * const protocols[] = { 
#endif



#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \

   (CURL_SIZEOF_CURL_OFF_T > 4) && \

   (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))

  &Curl_handler_smb,

#ifdef USE_SSL

lib/version.c

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static const char * const protocols[] = { 
  "sftp",

#endif

#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \

   (CURL_SIZEOF_CURL_OFF_T > 4) && \

   (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))

  "smb",

#  ifdef USE_SSL