diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
| commit | f87a3d736f3200029c8bed3ab4dad50f9680be7a (patch) | |
| tree | 7db1fde8016a6f576d7cba006365f461aaee00d0 /src/tool_getparam.c | |
| parent | bf5218c85eba8d13c6c40a8047b8018b4ff5f1ed (diff) | |
| parent | f44b803f1605edcfc4058b1a818c44552f0affec (diff) | |
| download | curl-http2-push.tar.gz | |
Merge branch 'master' into http2-pushhttp2-push
Diffstat (limited to 'src/tool_getparam.c')
| -rw-r--r-- | src/tool_getparam.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index c86e6b4b1..339fb7b5d 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -158,12 +158,10 @@ static const struct LongShort aliases[]= { {"$3", "keepalive-time", TRUE}, {"$4", "post302", FALSE}, {"$5", "noproxy", TRUE}, -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) {"$6", "socks5-gssapi-service", TRUE}, {"$7", "socks5-gssapi-nec", FALSE}, {"$O", "proxy-service-name", TRUE}, {"$P", "service-name", TRUE}, -#endif {"$8", "proxy1.0", TRUE}, {"$9", "tftp-blksize", TRUE}, {"$A", "mail-from", TRUE}, @@ -898,7 +896,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ /* This specifies the noproxy list */ GetStr(&config->noproxy, nextarg); break; -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) case '6': /* --socks5-gssapi-service */ GetStr(&config->socks5_gssapi_service, nextarg); break; @@ -911,7 +908,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ case 'P': /* --service-name */ GetStr(&config->service_name, nextarg); break; -#endif case '8': /* --proxy1.0 */ /* http 1.0 proxy */ GetStr(&config->proxy, nextarg); |