From 9a56b173197d16b669b568dec4e3790e890094e6 Mon Sep 17 00:00:00 2001
From: Cliff Woolley <jwoolley@apache.org>
Date: Sat, 18 May 2002 04:13:13 +0000
Subject: [PATCH] Renames:   APR_XtOffset   -> APR_OFFSET   APR_XtOffsetOf ->
 APR_OFFSETOF

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95164 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/aaa/mod_auth.c             |  6 +++---
 modules/aaa/mod_auth_anon.c        | 10 +++++-----
 modules/aaa/mod_auth_dbm.c         | 10 +++++-----
 modules/arch/win32/mod_isapi.c     | 10 +++++-----
 modules/generators/mod_autoindex.c |  2 +-
 modules/http/mod_mime.c            | 30 +++++++++++++++---------------
 modules/mappers/mod_imap.c         |  6 +++---
 modules/metadata/mod_unique_id.c   | 12 ++++++------
 server/core.c                      | 26 +++++++++++++-------------
 9 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 2652fae949..51f94150d7 100644
--- a/modules/aaa/mod_auth.c
+++ b/modules/aaa/mod_auth.c
@@ -111,14 +111,14 @@ static const char *set_auth_slot(cmd_parms *cmd, void *offset, const char *f,
 static const command_rec auth_cmds[] =
 {
     AP_INIT_TAKE12("AuthUserFile", set_auth_slot,
-                   (void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile),
+                   (void *)APR_OFFSETOF(auth_config_rec, auth_pwfile),
                    OR_AUTHCFG, "text file containing user IDs and passwords"),
     AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,
-                   (void *) APR_XtOffsetOf(auth_config_rec, auth_grpfile),
+                   (void *)APR_OFFSETOF(auth_config_rec, auth_grpfile),
                    OR_AUTHCFG,
                    "text file containing group names and member user IDs"),
     AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,
-                 (void *) APR_XtOffsetOf(auth_config_rec, auth_authoritative),
+                 (void *)APR_OFFSETOF(auth_config_rec, auth_authoritative),
                  OR_AUTHCFG,
                  "Set to 'no' to allow access control to be passed along to "
                  "lower modules if the UserID is not known to this module"),
diff --git a/modules/aaa/mod_auth_anon.c b/modules/aaa/mod_auth_anon.c
index 61843e7370..5657f5ecc1 100644
--- a/modules/aaa/mod_auth_anon.c
+++ b/modules/aaa/mod_auth_anon.c
@@ -166,19 +166,19 @@ static const command_rec anon_auth_cmds[] =
     AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, 
      "a space-separated list of user IDs"),
     AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,
-     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_mustemail),
+     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_mustemail),
      OR_AUTHCFG, "Limited to 'on' or 'off'"),
     AP_INIT_FLAG("Anonymous_NoUserId", ap_set_flag_slot,
-     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_nouserid),
+     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_nouserid),
      OR_AUTHCFG, "Limited to 'on' or 'off'"),
     AP_INIT_FLAG("Anonymous_VerifyEmail", ap_set_flag_slot,
-     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_verifyemail),
+     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_verifyemail),
      OR_AUTHCFG, "Limited to 'on' or 'off'"),
     AP_INIT_FLAG("Anonymous_LogEmail", ap_set_flag_slot,
-     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_logemail),
+     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_logemail),
      OR_AUTHCFG, "Limited to 'on' or 'off'"),
     AP_INIT_FLAG("Anonymous_Authoritative", ap_set_flag_slot,
-     (void *)APR_XtOffsetOf(anon_auth_config_rec, anon_auth_authoritative),
+     (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_authoritative),
      OR_AUTHCFG, "Limited to 'on' or 'off'"),
     {NULL}
 };
diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
index a88765d802..2a5a786a11 100644
--- a/modules/aaa/mod_auth_dbm.c
+++ b/modules/aaa/mod_auth_dbm.c
@@ -126,22 +126,22 @@ static const char *set_dbm_type(cmd_parms *cmd,
 static const command_rec dbm_auth_cmds[] =
 {
     AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
-     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
+     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
      OR_AUTHCFG, "dbm database file containing user IDs and passwords"),
     AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
-     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
+     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
      OR_AUTHCFG, "dbm database file containing group names and member user IDs"),
     AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,
-     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
+     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
      OR_AUTHCFG, NULL),
     AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
-     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
+     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
      OR_AUTHCFG, NULL),
     AP_INIT_TAKE1("AuthDBMType", set_dbm_type,
      NULL,
      OR_AUTHCFG, "what type of DBM file the user file is"),
     AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
-     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
+     (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmauthoritative),
      OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"),
     {NULL}
 };
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index e4cb1ab4a8..51135e1dc7 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -207,23 +207,23 @@ static const char *isapi_cmd_cachefile(cmd_parms *cmd, void *dummy,
 
 static const command_rec isapi_cmds[] = {
     AP_INIT_TAKE1("ISAPIReadAheadBuffer", ap_set_int_slot,
-        (void *) APR_XtOffsetOf(isapi_dir_conf, read_ahead_buflen), 
+        (void *)APR_OFFSETOF(isapi_dir_conf, read_ahead_buflen), 
         OR_FILEINFO, "Maximum client request body to initially pass to the"
                      " ISAPI handler (default: 48192)"),
     AP_INIT_FLAG("ISAPILogNotSupported", ap_set_int_slot,
-        (void *) APR_XtOffsetOf(isapi_dir_conf, log_unsupported), 
+        (void *)APR_OFFSETOF(isapi_dir_conf, log_unsupported), 
         OR_FILEINFO, "Log requests not supported by the ISAPI server"
                      " on or off (default: off)"),
     AP_INIT_FLAG("ISAPIAppendLogToErrors", ap_set_flag_slot,
-        (void *) APR_XtOffsetOf(isapi_dir_conf, log_to_errlog), 
+        (void *)APR_OFFSETOF(isapi_dir_conf, log_to_errlog), 
         OR_FILEINFO, "Send all Append Log requests to the error log"
                      " on or off (default: off)"),
     AP_INIT_FLAG("ISAPIAppendLogToQuery", ap_set_flag_slot,
-        (void *) APR_XtOffsetOf(isapi_dir_conf, log_to_query), 
+        (void *)APR_OFFSETOF(isapi_dir_conf, log_to_query), 
         OR_FILEINFO, "Append Log requests are concatinated to the query args"
                      " on or off (default: on)"),
     AP_INIT_FLAG("ISAPIFakeAsync", ap_set_flag_slot,
-        (void *) APR_XtOffsetOf(isapi_dir_conf, fake_async), 
+        (void *)APR_OFFSETOF(isapi_dir_conf, fake_async), 
         OR_FILEINFO, "Fake Asynchronous support for isapi callbacks"
                      " on or off [Experimental] (default: off)"),
     AP_INIT_ITERATE("ISAPICacheFile", isapi_cmd_cachefile, NULL, 
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 494d36dbc8..e7551a5eaa 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -585,7 +585,7 @@ static const command_rec autoindex_cmds[] =
     AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, NULL, OR_ALL,
                  "The FancyIndexing directive is no longer supported.  Use IndexOptions FancyIndexing."),
     AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
-                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),
+                  (void *)APR_OFFSETOF(autoindex_config_rec, default_icon),
                   DIR_CMD_PERMS, "an icon URL"),
     {NULL}
 };
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 5af020ccaa..c777917bb0 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -379,54 +379,54 @@ static const char *multiviews_match(cmd_parms *cmd, void *m_,
 static const command_rec mime_cmds[] =
 {
     AP_INIT_ITERATE2("AddCharset", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, charset_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, charset_type), OR_FILEINFO,
         "a charset (e.g., iso-2022-jp), followed by one or more "
         "file extensions"),
     AP_INIT_ITERATE2("AddEncoding", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, encoding_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, encoding_type), OR_FILEINFO,
         "an encoding (e.g., gzip), followed by one or more file extensions"),
     AP_INIT_ITERATE2("AddHandler", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, handler), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, handler), OR_FILEINFO,
         "a handler name followed by one or more file extensions"),
     AP_INIT_ITERATE2("AddInputFilter", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, input_filters), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, input_filters), OR_FILEINFO,
         "input filter name (or ; delimited names) followed by one or "
         "more file extensions"),
     AP_INIT_ITERATE2("AddLanguage", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, language_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, language_type), OR_FILEINFO,
         "a language (e.g., fr), followed by one or more file extensions"),
     AP_INIT_ITERATE2("AddOutputFilter", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, output_filters), OR_FILEINFO, 
+        (void *)APR_OFFSETOF(extension_info, output_filters), OR_FILEINFO, 
         "output filter name (or ; delimited names) followed by one or "
         "more file extensions"),
     AP_INIT_ITERATE2("AddType", add_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, forced_type), OR_FILEINFO, 
+        (void *)APR_OFFSETOF(extension_info, forced_type), OR_FILEINFO, 
         "a mime type followed by one or more file extensions"),
     AP_INIT_TAKE1("DefaultLanguage", ap_set_string_slot,
-        (void*)APR_XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
+        (void*)APR_OFFSETOF(mime_dir_config, default_language), OR_FILEINFO,
         "language to use for documents with no other language file extension"),
     AP_INIT_ITERATE("MultiviewsMatch", multiviews_match, NULL, OR_FILEINFO,
         "NegotiatedOnly (default), Handlers and/or Filters, or Any"),
     AP_INIT_ITERATE("RemoveCharset", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, charset_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, charset_type), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveEncoding", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, encoding_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, encoding_type), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveHandler", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, handler), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, handler), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveInputFilter", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, input_filters), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, input_filters), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveLanguage", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, language_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, language_type), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveOutputFilter", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, output_filters), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, output_filters), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_ITERATE("RemoveType", remove_extension_info, 
-        (void *)APR_XtOffsetOf(extension_info, forced_type), OR_FILEINFO,
+        (void *)APR_OFFSETOF(extension_info, forced_type), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_TAKE1("TypesConfig", set_types_config, NULL, RSRC_CONF,
         "the MIME types config file"),
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index ab18283bb3..791a9fa313 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -163,15 +163,15 @@ static void *merge_imap_dir_configs(apr_pool_t *p, void *basev, void *addv)
 static const command_rec imap_cmds[] =
 {
     AP_INIT_TAKE1("ImapMenu", ap_set_string_slot,
-                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES,
+                  (void *)APR_OFFSETOF(imap_conf_rec, imap_menu), OR_INDEXES,
                   "the type of menu generated: none, formatted, semiformatted, "
                   "unformatted"),
     AP_INIT_TAKE1("ImapDefault", ap_set_string_slot,
-                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_default), OR_INDEXES,
+                  (void *)APR_OFFSETOF(imap_conf_rec, imap_default), OR_INDEXES,
                   "the action taken if no match: error, nocontent, referer, "
                   "menu, URL"),
     AP_INIT_TAKE1("ImapBase", ap_set_string_slot,
-                  (void *) APR_XtOffsetOf(imap_conf_rec, imap_base), OR_INDEXES,
+                  (void *)APR_OFFSETOF(imap_conf_rec, imap_base), OR_INDEXES,
                   "the base for all URL's: map, referer, URL (or start of)"),
     {NULL}
 };
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 7c8b73fcd5..6423945655 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -65,7 +65,7 @@
 
 #define APR_WANT_BYTEFUNC   /* for htons() et al */
 #include "apr_want.h"
-#include "apr_general.h"    /* for APR_XtOffsetOf                */
+#include "apr_general.h"    /* for APR_OFFSETOF                */
 #include "apr_network_io.h"
 
 #include "httpd.h"
@@ -183,15 +183,15 @@ static int unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pt
     /*
      * Calculate the sizes and offsets in cur_unique_id.
      */
-    unique_id_rec_offset[0] = APR_XtOffsetOf(unique_id_rec, stamp);
+    unique_id_rec_offset[0] = APR_OFFSETOF(unique_id_rec, stamp);
     unique_id_rec_size[0] = sizeof(cur_unique_id.stamp);
-    unique_id_rec_offset[1] = APR_XtOffsetOf(unique_id_rec, in_addr);
+    unique_id_rec_offset[1] = APR_OFFSETOF(unique_id_rec, in_addr);
     unique_id_rec_size[1] = sizeof(cur_unique_id.in_addr);
-    unique_id_rec_offset[2] = APR_XtOffsetOf(unique_id_rec, pid);
+    unique_id_rec_offset[2] = APR_OFFSETOF(unique_id_rec, pid);
     unique_id_rec_size[2] = sizeof(cur_unique_id.pid);
-    unique_id_rec_offset[3] = APR_XtOffsetOf(unique_id_rec, counter);
+    unique_id_rec_offset[3] = APR_OFFSETOF(unique_id_rec, counter);
     unique_id_rec_size[3] = sizeof(cur_unique_id.counter);
-    unique_id_rec_offset[4] = APR_XtOffsetOf(unique_id_rec, thread_index);
+    unique_id_rec_offset[4] = APR_OFFSETOF(unique_id_rec, thread_index);
     unique_id_rec_size[4] = sizeof(cur_unique_id.thread_index);
     unique_id_rec_total_size = unique_id_rec_size[0] + unique_id_rec_size[1] +
                                unique_id_rec_size[2] + unique_id_rec_size[3] +
diff --git a/server/core.c b/server/core.c
index 82894eeca2..389977056f 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2865,7 +2865,7 @@ AP_INIT_RAW_ARGS("<LocationMatch", urlsection, (void*)1, RSRC_CONF,
 AP_INIT_RAW_ARGS("<FilesMatch", filesection, (void*)1, OR_ALL,
   "Container for directives affecting files matching specified patterns"),
 AP_INIT_TAKE1("AuthType", ap_set_string_slot,
-  (void*)APR_XtOffsetOf(core_dir_config, ap_auth_type), OR_AUTHCFG,
+  (void*)APR_OFFSETOF(core_dir_config, ap_auth_type), OR_AUTHCFG,
   "An HTTP authorization type (e.g., \"Basic\")"),
 AP_INIT_TAKE1("AuthName", set_authname, NULL, OR_AUTHCFG,
   "The authentication realm (e.g. \"Members Only\")"),
@@ -2896,7 +2896,7 @@ AP_INIT_RAW_ARGS("AllowOverride", set_override, NULL, ACCESS_CONF,
 AP_INIT_RAW_ARGS("Options", set_options, NULL, OR_OPTIONS,
   "Set a number of attributes for a given directory"),
 AP_INIT_TAKE1("DefaultType", ap_set_string_slot,
-  (void*)APR_XtOffsetOf (core_dir_config, ap_default_type),
+  (void*)APR_OFFSETOF(core_dir_config, ap_default_type),
   OR_FILEINFO, "the default MIME type for untypable files"),
 AP_INIT_RAW_ARGS("FileETag", set_etag_bits, NULL, OR_FILEINFO,
   "Specify components used to construct a file's ETag"),
@@ -2912,7 +2912,7 @@ AP_INIT_TAKE1("HostnameLookups", set_hostname_lookups, NULL,
   "\"on\" to enable, \"off\" to disable reverse DNS lookups, or \"double\" to "
   "enable double-reverse DNS lookups"),
 AP_INIT_TAKE1("ServerAdmin", set_server_string_slot,
-  (void *)APR_XtOffsetOf (server_rec, server_admin), RSRC_CONF,
+  (void *)APR_OFFSETOF(server_rec, server_admin), RSRC_CONF,
   "The email address of the server administrator"),
 AP_INIT_TAKE1("ServerName", server_hostname_port, NULL, RSRC_CONF,
   "The hostname and port of the server"),
@@ -2921,7 +2921,7 @@ AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL,
 AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF | EXEC_ON_READ,
   "Common directory of server-related files (logs, confs, etc.)"),
 AP_INIT_TAKE1("ErrorLog", set_server_string_slot,
-  (void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF | EXEC_ON_READ,
+  (void *)APR_OFFSETOF(server_rec, error_fname), RSRC_CONF | EXEC_ON_READ,
   "The filename of the error log"),
 AP_INIT_RAW_ARGS("ServerAlias", set_server_alias, NULL, RSRC_CONF,
   "A name or names alternately used to access the server"),
@@ -2959,7 +2959,7 @@ AP_INIT_TAKE1("LimitRequestFieldsize", set_limit_req_fieldsize, NULL,
 AP_INIT_TAKE1("LimitRequestFields", set_limit_req_fields, NULL, RSRC_CONF,
   "Limit (0 = unlimited) on max number of header fields in a request message"),
 AP_INIT_TAKE1("LimitRequestBody", set_limit_req_body,
-  (void*)APR_XtOffsetOf(core_dir_config, limit_req_body), OR_ALL,
+  (void*)APR_OFFSETOF(core_dir_config, limit_req_body), OR_ALL,
   "Limit (in bytes) on maximum size of request message body"),
 AP_INIT_TAKE1("LimitXMLRequestBody", set_limit_xml_req_body, NULL, OR_ALL,
               "Limit (in bytes) on maximum size of an XML-based request "
@@ -2968,7 +2968,7 @@ AP_INIT_TAKE1("LimitXMLRequestBody", set_limit_xml_req_body, NULL, OR_ALL,
 /* System Resource Controls */
 #ifdef RLIMIT_CPU
 AP_INIT_TAKE12("RLimitCPU", set_limit_cpu,
-  (void*)APR_XtOffsetOf(core_dir_config, limit_cpu),
+  (void*)APR_OFFSETOF(core_dir_config, limit_cpu),
   OR_ALL, "Soft/hard limits for max CPU usage in seconds"),
 #else
 AP_INIT_TAKE12("RLimitCPU", no_set_limit, NULL,
@@ -2976,7 +2976,7 @@ AP_INIT_TAKE12("RLimitCPU", no_set_limit, NULL,
 #endif
 #if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined (RLIMIT_AS)
 AP_INIT_TAKE12("RLimitMEM", set_limit_mem,
-  (void*)APR_XtOffsetOf(core_dir_config, limit_mem),
+  (void*)APR_OFFSETOF(core_dir_config, limit_mem),
   OR_ALL, "Soft/hard limits for max memory usage per process"),
 #else
 AP_INIT_TAKE12("RLimitMEM", no_set_limit, NULL,
@@ -2984,7 +2984,7 @@ AP_INIT_TAKE12("RLimitMEM", no_set_limit, NULL,
 #endif
 #ifdef RLIMIT_NPROC
 AP_INIT_TAKE12("RLimitNPROC", set_limit_nproc,
-  (void*)APR_XtOffsetOf(core_dir_config, limit_nproc),
+  (void*)APR_OFFSETOF(core_dir_config, limit_nproc),
   OR_ALL, "soft/hard limits for max number of processes per uid"),
 #else
 AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,
@@ -2992,19 +2992,19 @@ AP_INIT_TAKE12("RLimitNPROC", no_set_limit, NULL,
 #endif
 
 AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower,
-       (void *)APR_XtOffsetOf(core_dir_config, mime_type), OR_FILEINFO,
+       (void *)APR_OFFSETOF(core_dir_config, mime_type), OR_FILEINFO,
      "a mime type that overrides other configured type"),
 AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower,
-       (void *)APR_XtOffsetOf(core_dir_config, handler), OR_FILEINFO,
+       (void *)APR_OFFSETOF(core_dir_config, handler), OR_FILEINFO,
    "a handler name that overrides any other configured handler"),
 AP_INIT_TAKE1("SetOutputFilter", ap_set_string_slot,
-       (void *)APR_XtOffsetOf(core_dir_config, output_filters), OR_FILEINFO,
+       (void *)APR_OFFSETOF(core_dir_config, output_filters), OR_FILEINFO,
    "filter (or ; delimited list of filters) to be run on the request content"),
 AP_INIT_TAKE1("SetInputFilter", ap_set_string_slot,
-       (void *)APR_XtOffsetOf(core_dir_config, input_filters), OR_FILEINFO,
+       (void *)APR_OFFSETOF(core_dir_config, input_filters), OR_FILEINFO,
    "filter (or ; delimited list of filters) to be run on the request body"),
 AP_INIT_ITERATE2("AddOutputFilterByType", add_ct_output_filters,
-       (void *)APR_XtOffsetOf(core_dir_config, ct_output_filters), OR_FILEINFO,
+       (void *)APR_OFFSETOF(core_dir_config, ct_output_filters), OR_FILEINFO,
      "output filter name followed by one or more content-types"),
 
 /*
-- 
2.50.1