diff options
| author | Edward Thomson <ethomson@github.com> | 2016-12-20 15:28:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 15:28:46 +0000 |
| commit | f91f170f0e334963473a0f1060d2b07fbe63abbf (patch) | |
| tree | 570210690c8e602eef19d35e2c3ac9a6ef9e74d6 /src/settings.c | |
| parent | 329ce0439b38c03d2b887f1d12b8914a77c038e1 (diff) | |
| parent | 77e4623257dbdabb98e7ed5812ae4a8614c815b6 (diff) | |
| download | libgit2-f91f170f0e334963473a0f1060d2b07fbe63abbf.tar.gz | |
Merge pull request #4032 from libgit2/cmn/https-cap-no-hardcode
Don't hard-code HTTPS cap & clarify the meanings of the features enum
Diffstat (limited to 'src/settings.c')
| -rw-r--r-- | src/settings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings.c b/src/settings.c index cb2317f74..4a6e0f353 100644 --- a/src/settings.c +++ b/src/settings.c @@ -29,7 +29,9 @@ int git_libgit2_features(void) #ifdef GIT_THREADS | GIT_FEATURE_THREADS #endif +#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) | GIT_FEATURE_HTTPS +#endif #if defined(GIT_SSH) | GIT_FEATURE_SSH #endif |