From 0032ce762eed505905d7e5ef766134ffa6d69b5c Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 22 Jan 2010 14:20:56 +0000
Subject: [PATCH] fix compilation when http is disabled
---
lib/http.c | 5 +----
lib/rtsp.h | 34 +++++++++++++++++-----------------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/lib/http.c b/lib/http.c
index fc533bfe3c..53e991b200 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -3065,10 +3065,6 @@ checkprotoprefix(struct SessionHandle *data, struct connectdata *conn,
return checkhttpprefix(data, s);
}
-#endif
-
-
-
/*
* header_append() copies a chunk of data to the end of the already received
* header. We make sure that the full string fit in the allocated header
@@ -3805,3 +3801,4 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
return CURLE_OK;
}
+#endif /* CURL_DISABLE_HTTP */
diff --git a/lib/rtsp.h b/lib/rtsp.h
index dcc8d392ed..dcb50d3b09 100644
--- a/lib/rtsp.h
+++ b/lib/rtsp.h
@@ -25,9 +25,25 @@
***************************************************************************/
#ifndef CURL_DISABLE_RTSP
-
extern const struct Curl_handler Curl_handler_rtsp;
+CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data,
+ struct connectdata *conn,
+ ssize_t *nread,
+ bool *readmore,
+ bool *done);
+
+
+/* protocol-specific functions set up to be called by the main engine */
+CURLcode Curl_rtsp(struct connectdata *conn, bool *done);
+CURLcode Curl_rtsp_done(struct connectdata *conn, CURLcode, bool premature);
+CURLcode Curl_rtsp_connect(struct connectdata *conn, bool *done);
+CURLcode Curl_rtsp_disconnect(struct connectdata *conn);
+
+CURLcode Curl_rtsp_parseheader(struct connectdata *conn, char *header);
+
+#endif /* CURL_DISABLE_RTSP */
+
/*
* RTSP Connection data
*
@@ -58,20 +74,4 @@ struct RTSP {
};
-CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data,
- struct connectdata *conn,
- ssize_t *nread,
- bool *readmore,
- bool *done);
-
-
-/* protocol-specific functions set up to be called by the main engine */
-CURLcode Curl_rtsp(struct connectdata *conn, bool *done);
-CURLcode Curl_rtsp_done(struct connectdata *conn, CURLcode, bool premature);
-CURLcode Curl_rtsp_connect(struct connectdata *conn, bool *done);
-CURLcode Curl_rtsp_disconnect(struct connectdata *conn);
-
-CURLcode Curl_rtsp_parseheader(struct connectdata *conn, char *header);
-
-#endif /* CURL_DISABLE_RTSP */
#endif /* __RTSP_H_ */
--
GitLab