From 13b64d75589647f8d151e035bd2c5d340a1c37ee Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 14 Mar 2011 22:52:14 +0100 Subject: protocols: use CURLPROTO_ internally The PROT_* set of internal defines for the protocols is no longer used. We now use the same bits internally as we have defined in the public header using the CURLPROTO_ prefix. This is for simplicity and because the PROT_* prefix was already used duplicated internally for a set of KRB4 values. The PROTOPT_* defines were moved up to just below the struct definition within which they are used. --- lib/curl_rtmp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/curl_rtmp.c') diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index 183db0ded..bae8a76c0 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -74,7 +74,7 @@ const struct Curl_handler Curl_handler_rtmp = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMP, /* defport */ - PROT_RTMP, /* protocol */ + CURLPROTO_RTMP, /* protocol */ PROTOPT_NONE /* flags*/ }; @@ -92,7 +92,7 @@ const struct Curl_handler Curl_handler_rtmpt = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMPT, /* defport */ - PROT_RTMPT, /* protocol */ + CURLPROTO_RTMPT, /* protocol */ PROTOPT_NONE /* flags*/ }; @@ -110,7 +110,7 @@ const struct Curl_handler Curl_handler_rtmpe = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMP, /* defport */ - PROT_RTMPE, /* protocol */ + CURLPROTO_RTMPE, /* protocol */ PROTOPT_NONE /* flags*/ }; @@ -128,7 +128,7 @@ const struct Curl_handler Curl_handler_rtmpte = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMPT, /* defport */ - PROT_RTMPTE, /* protocol */ + CURLPROTO_RTMPTE, /* protocol */ PROTOPT_NONE /* flags*/ }; @@ -146,7 +146,7 @@ const struct Curl_handler Curl_handler_rtmps = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMPS, /* defport */ - PROT_RTMPS, /* protocol */ + CURLPROTO_RTMPS, /* protocol */ PROTOPT_NONE /* flags*/ }; const struct Curl_handler Curl_handler_rtmpts = { @@ -163,7 +163,7 @@ const struct Curl_handler Curl_handler_rtmpts = { ZERO_NULL, /* perform_getsock */ rtmp_disconnect, /* disconnect */ PORT_RTMPS, /* defport */ - PROT_RTMPTS, /* protocol */ + CURLPROTO_RTMPTS, /* protocol */ PROTOPT_NONE /* flags*/ }; -- cgit v1.2.1