summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Ischo <bji@lolita.(none)>2009-01-21 16:14:51 +1300
committerBryan Ischo <bji@lolita.(none)>2009-01-21 16:14:51 +1300
commit2d4054947bdcaa1228225a87d3aafafa6cb83d82 (patch)
tree88b9a029405fdb6757c18756184bd55adcaa379b
parentfe69a3ef69e338df12e65fa358c0461a2b6b13ca (diff)
parent4bdf722f2293b0f65b759d6124a55f356eb54570 (diff)
downloadceph-libs3-2d4054947bdcaa1228225a87d3aafafa6cb83d82.tar.gz
Merge branch '1.4'
-rw-r--r--src/request_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/request_context.c b/src/request_context.c
index bccaee8..ae48e55 100644
--- a/src/request_context.c
+++ b/src/request_context.c
@@ -132,7 +132,7 @@ S3Status S3_runonce_request_context(S3RequestContext *requestContext,
}
Request *request;
if (curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE,
- (char **) &request) != CURLE_OK) {
+ (char **) (char *) &request) != CURLE_OK) {
return S3StatusInternalError;
}
// Remove the request from the list of requests