diff options
| author | Lucas Eckels <eckels@google.com> | 2012-08-06 15:07:02 -0700 |
|---|---|---|
| committer | Lucas Eckels <eckels@google.com> | 2012-08-08 09:28:48 -0700 |
| commit | 9bd90e6e25f1e55f50201c87a1b5837de7e5b64a (patch) | |
| tree | d2061a00d7d0ee884170bc955fceeed2d0edf284 /lib/setup.h | |
| parent | e6f2b03027b5feb92b30f5d47801ec3fabe9fd95 (diff) | |
| download | android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.tar.gz android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.tar.bz2 android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.zip | |
Add Music Manager's curl 7.21.2 source.
Change-Id: I259a43fa52d581524a5ce8ae1711467acb1d9d50
Diffstat (limited to 'lib/setup.h')
| -rw-r--r-- | lib/setup.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/lib/setup.h b/lib/setup.h index ca98ad7..cc016c9 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -356,6 +356,18 @@ # endif #endif +/* + * Arg 2 type for gethostname in case it hasn't been defined in config file. + */ + +#ifndef GETHOSTNAME_TYPE_ARG2 +# ifdef USE_WINSOCK +# define GETHOSTNAME_TYPE_ARG2 int +# else +# define GETHOSTNAME_TYPE_ARG2 size_t +# endif +#endif + /* Below we define some functions. They should 4. set the SIGALRM signal timeout @@ -497,7 +509,7 @@ #if defined(_MSC_VER) && !defined(__POCC__) # if !defined(HAVE_WINDOWS_H) || ((_MSC_VER < 1300) && !defined(_FILETIME_)) # if !defined(ALLOW_MSVC6_WITHOUT_PSDK) -# error MSVC 6.0 requires 'February 2003 Platform SDK' a.k.a. 'Windows Server 2003 PSDK' +# error MSVC 6.0 requires "February 2003 Platform SDK" a.k.a. "Windows Server 2003 PSDK" # else # define CURL_DISABLE_LDAP 1 # endif @@ -525,12 +537,12 @@ int netware_init(void); #define LIBIDN_REQUIRED_VERSION "0.4.1" -#if defined(USE_GNUTLS) || defined(USE_SSLEAY) || defined(USE_NSS) || defined(USE_QSOSSL) +#if defined(USE_GNUTLS) || defined(USE_SSLEAY) || defined(USE_NSS) || defined(USE_QSOSSL) || defined(USE_POLARSSL) #define USE_SSL /* SSL support has been enabled */ #endif #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM) -#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || defined(USE_GNUTLS) +#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || defined(USE_GNUTLS) || defined(USE_NSS) #define USE_NTLM #endif #endif @@ -540,6 +552,11 @@ int netware_init(void); #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") #endif +/* Define S_ISREG if not defined by system headers, f.e. MSVC */ +#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + /* * Include macros and defines that should only be processed once. */ |