Skip to content

use offsetof instead of XtOffsetOf #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remicollet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use offsetof instead of XtOffsetOf #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xmlrpc-epi-php.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ zend_class_entry *xmlrpc_server_ce;
static zend_object_handlers xmlrpc_server_object_handlers;

static inline xmlrpc_server_data *xmlrpc_server_from_obj(zend_object *obj) {
return (xmlrpc_server_data *)((char *)(obj) - XtOffsetOf(xmlrpc_server_data, std));
return (xmlrpc_server_data *)((char *)(obj) - offsetof(xmlrpc_server_data, std));
}

#define Z_XMLRPC_SERVER_P(zv) xmlrpc_server_from_obj(Z_OBJ_P(zv))
Expand Down Expand Up @@ -237,7 +237,7 @@ PHP_MINIT_FUNCTION(xmlrpc)
#endif

memcpy(&xmlrpc_server_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
xmlrpc_server_object_handlers.offset = XtOffsetOf(xmlrpc_server_data, std);
xmlrpc_server_object_handlers.offset = offsetof(xmlrpc_server_data, std);
xmlrpc_server_object_handlers.free_obj = xmlrpc_server_free_obj;
xmlrpc_server_object_handlers.get_gc = xmlrpc_server_get_gc;
xmlrpc_server_object_handlers.get_constructor = xmlrpc_server_get_constructor;
Expand Down