summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornot-a-robot <not-a-robot@rediger.net>2016-04-20 16:54:36 +0200
committernot-a-robot <not-a-robot@rediger.net>2016-04-20 16:54:36 +0200
commitf201e79bf45c948cb38b6686af1a56bbfe79c5da (patch)
tree80e57cfd4d6e33dd304918e8c2c86441fcca5148
parent92d0e236611b841179d180e848c184d107f4a8be (diff)
parent8f5265ded340c70c87370c99fea6787c34ea1e55 (diff)
Auto merge of #411 - redis:backwards-compatibility-macros, r=badboy
fix: Remove backwards compatibility macro's Closes #296 BREAKING CHANGE: This removes the redisReplyReader* functions, which are already replaced by redisReader* functions. It renames `redisReplyReaderSetPrivdata`, `redisReplyReaderGetObject` and `redisReplyReaderGetError` to `redisReaderSetPrivdata`, `redisReaderGetObject` and `redisReaderGetError`.
-rw-r--r--read.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/read.h b/read.h
index 180e6c6..2988aa4 100644
--- a/read.h
+++ b/read.h
@@ -100,14 +100,9 @@ void redisReaderFree(redisReader *r);
int redisReaderFeed(redisReader *r, const char *buf, size_t len);
int redisReaderGetReply(redisReader *r, void **reply);
-/* Backwards compatibility, can be removed on big version bump. */
-#define redisReplyReaderCreate redisReaderCreate
-#define redisReplyReaderFree redisReaderFree
-#define redisReplyReaderFeed redisReaderFeed
-#define redisReplyReaderGetReply redisReaderGetReply
-#define redisReplyReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
-#define redisReplyReaderGetObject(_r) (((redisReader*)(_r))->reply)
-#define redisReplyReaderGetError(_r) (((redisReader*)(_r))->errstr)
+#define redisReaderSetPrivdata(_r, _p) (int)(((redisReader*)(_r))->privdata = (_p))
+#define redisReaderGetObject(_r) (((redisReader*)(_r))->reply)
+#define redisReaderGetError(_r) (((redisReader*)(_r))->errstr)
#ifdef __cplusplus
}