-#define memcached_server_response_decrement(A) (A)->cursor_active_--
-#define memcached_server_response_reset(A) (A)->cursor_active_ = 0
+#define memcached_server_response_decrement(A) do { \
+ WATCHPOINT_ASSERT((A)->cursor_active_ > 0); \
+ if ((A)->cursor_active_ > 0) { \
+ (A)->cursor_active_--; \
+ } \
+} while (0)
+#define memcached_server_response_reset(A) (A)->cursor_active_ = 0