php_mapi: rip PHP-specific types from zcore_client.hpp

Make zcore_client usable without php.h.

Author: jengelh

include/gromox/zcore_client.hpp

@@ -1,19 +1,12 @@
 #pragma once
-#include "php.h"
-#undef slprintf
-#undef vslprintf
-#undef snprintf
-#undef vsnprintf
-#undef vasprintf
-#undef asprintf
 #include <cstdint>
 #include <ctime>
 #include <vector>
 #include <gromox/zcore_rpc.hpp>
 
 struct zcreq;
 struct zcresp;
-extern zend_bool zclient_do_rpc(const zcreq *, zcresp *);
+extern bool zclient_do_rpc(const zcreq *, zcresp *);
 extern ec_error_t zclient_setpropval(GUID ses, uint32_t obj, gromox::proptag_t, const void *);
 extern ec_error_t zclient_getpropval(GUID ses, uint32_t obj, gromox::proptag_t, void **);
 
@@ -78,9 +71,9 @@ ZCIDL(copyto, (GUID hsession, uint32_t hsrcobject, const PROPTAG_ARRAY *pexclude
 ZCIDL(savechanges, (GUID hsession, uint32_t hobject))
 ZCIDL(hierarchysync, (GUID hsession, uint32_t hfolder, IDLOUT uint32_t *hobject))
 ZCIDL(contentsync, (GUID hsession, uint32_t hfolder, IDLOUT uint32_t *hobject))
-ZCIDL(configsync, (GUID hsession, uint32_t hctx, uint32_t flags, const BINARY *pstate, const RESTRICTION *prestriction, IDLOUT zend_bool *b_changed, uint32_t *count))
+ZCIDL(configsync, (GUID hsession, uint32_t hctx, uint32_t flags, const BINARY *pstate, const RESTRICTION *prestriction, IDLOUT uint8_t *b_changed, uint32_t *count))
 ZCIDL(statesync, (GUID hsession, uint32_t hctx, IDLOUT BINARY *state))
-ZCIDL(syncmessagechange, (GUID hsession, uint32_t hctx, IDLOUT zend_bool *b_new, TPROPVAL_ARRAY *proplist))
+ZCIDL(syncmessagechange, (GUID hsession, uint32_t hctx, IDLOUT uint8_t *b_new, TPROPVAL_ARRAY *proplist))
 ZCIDL(syncfolderchange, (GUID hsession, uint32_t hctx, IDLOUT TPROPVAL_ARRAY *proplist))
 ZCIDL(syncreadstatechanges, (GUID hsession, uint32_t hctx, IDLOUT STATE_ARRAY *states))
 ZCIDL(syncdeletions, (GUID hsession, uint32_t hctx, uint32_t flags, IDLOUT BINARY_ARRAY *bins))

php_mapi/mapi.cpp

@@ -103,7 +103,7 @@ struct ICS_EXPORT_CTX {
 	uint32_t hobject;
 	uint8_t ics_type;
 	zval pztarget_obj;
-	zend_bool b_changed;
+	uint8_t b_changed;
 	uint32_t progress;
 	uint32_t sync_steps;
 	uint32_t total_steps;
@@ -3246,7 +3246,6 @@ static ZEND_FUNCTION(mapi_exportchanges_synchronize)
 {
 	ZCL_MEMORY;
 	uint32_t flags;
-	zend_bool b_new;
 	zval *pzresource;
 	BINARY_ARRAY bins;
 	STATE_ARRAY states;
@@ -3293,6 +3292,7 @@ static ZEND_FUNCTION(mapi_exportchanges_synchronize)
 	}
 	for (size_t i = 0; i < pctx->sync_steps; ++i, ++pctx->progress) {
 		if (ICS_TYPE_CONTENTS == pctx->ics_type) {
+			uint8_t b_new = false;
 			auto result = zclient_syncmessagechange(
 				pctx->hsession, pctx->hobject, &b_new,
 				&propvals);

php_mapi/zclient.cpp

@@ -100,7 +100,7 @@ static zend_bool zclient_write_socket(int sockd, const BINARY &pbin)
 	}
 }
 
-zend_bool zclient_do_rpc(const zcreq *prequest, zcresp *presponse)
+bool zclient_do_rpc(const zcreq *prequest, zcresp *presponse)
 {
 	BINARY tmp_bin;