Update the Apache code to account for the XtOffset change in APR.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90356 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 482b0249d4e266da5559968392b3b9767e5b040c..1e0233089ddeb8f2397c5f259476a41f49b82ae4 100644 (file)
--- a/modules/aaa/mod_auth.c
+++ b/modules/aaa/mod_auth.c
@@ -110,13 +110,13 @@ 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 *) XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,
+                   (void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,
                    "text file containing user IDs and passwords"),
     AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,
-                   (void *) XtOffsetOf(auth_config_rec, auth_grpfile), OR_AUTHCFG,
+                   (void *) APR_XtOffsetOf(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 *) XtOffsetOf(auth_config_rec, auth_authoritative),
+                 (void *) APR_XtOffsetOf(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_db.c b/modules/aaa/mod_auth_db.c
index 3c135312806cc28a65de1d7dc905644b64986f56..958c43ab7ee0a9ecb342153950af376f6821bc92 100644 (file)
--- a/modules/aaa/mod_auth_db.c
+++ b/modules/aaa/mod_auth_db.c
@@ -146,19 +146,19 @@ static const char *set_db_slot(cmd_parms *cmd, void *offset, const char *f, cons
 static const command_rec db_auth_cmds[] =
 {
     AP_INIT_TAKE1("AuthDBUserFile", ap_set_file_slot,
-     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
+     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
      OR_AUTHCFG, "db database file containing user IDs and passwords"),
     AP_INIT_TAKE1("AuthDBGroupFile", ap_set_file_slot,
-     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
+     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
      OR_AUTHCFG, "db database file containing group names and member user IDs"),
     AP_INIT_TAKE12("AuthUserFile", set_db_slot,
-     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
+     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
      OR_AUTHCFG, NULL),
     AP_INIT_TAKE12("AuthGroupFile", set_db_slot,
-     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
+     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
      OR_AUTHCFG, NULL),
     AP_INIT_FLAG("AuthDBAuthoritative", ap_set_flag_slot,
-     (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
+     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
      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"),
     {NULL}

diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
index 3d110e9659dcd26d15957d904827bd43fa8f929b..c904a2d36e96544c966282c7799eb0aed0efd037 100644 (file)
--- a/modules/aaa/mod_auth_dbm.c
+++ b/modules/aaa/mod_auth_dbm.c
@@ -142,19 +142,19 @@ static const char *set_dbm_slot(cmd_parms *cmd, void *offset,
 static const command_rec dbm_auth_cmds[] =
 {
     AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
-     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
+     (void *) APR_XtOffsetOf(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 *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
+     (void *) APR_XtOffsetOf(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 *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
+     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
      OR_AUTHCFG, NULL),
     AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
-     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
+     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
      OR_AUTHCFG, NULL),
     AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
-     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
+     (void *) APR_XtOffsetOf(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/aaa/mod_auth_ldap.c b/modules/aaa/mod_auth_ldap.c
index 563a36e917c88191c0e5486833e761fa548c7410..0beeda8c89dc373a76914f4bc129bb5ae8820ce4 100644 (file)
--- a/modules/aaa/mod_auth_ldap.c
+++ b/modules/aaa/mod_auth_ldap.c
@@ -754,26 +754,26 @@ command_rec mod_auth_ldap_cmds[] = {
                   "search on the branch <b>ou=People, o=Airius</b>."),
 
     AP_INIT_TAKE1("AuthLDAPBindDN", ap_set_string_slot,
-                  (void *)XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,
+                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,
                   "DN to use to bind to LDAP server. If not provided, will do an anonymous bind."),
 
     AP_INIT_TAKE1("AuthLDAPBindPassword", ap_set_string_slot,
-                  (void *)XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,
+                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,
                   "Password to use to bind to LDAP server. If not provided, will do an anonymous bind."),
 
     AP_INIT_FLAG("AuthLDAPRemoteUserIsDN", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,
                  "Set to 'on' to set the REMOTE_USER environment variable to be the full "
                  "DN of the remote user. By default, this is set to off, meaning that "
                  "the REMOTE_USER variable will contain whatever value the remote user sent."),
 
     AP_INIT_FLAG("AuthLDAPAuthoritative", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,
                  "Set to 'off' to allow access control to be passed along to lower modules if "
                  "the UserID and/or group is not known to this module"),
 
     AP_INIT_FLAG("AuthLDAPCompareDNOnServer", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server), OR_AUTHCFG,
                  "Set to 'on' to force auth_ldap to do DN compares (for the \"require dn\" "
                  "directive) using the server, and set it 'off' to do the compares locally "
                  "(at the expense of possible false matches). See the documentation for "
@@ -784,7 +784,7 @@ command_rec mod_auth_ldap_cmds[] = {
                     "member and uniquemember"),
 
     AP_INIT_FLAG("AuthLDAPGroupAttributeIsDN", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,
                  "If set to 'on', auth_ldap uses the DN that is retrieved from the server for"
                  "subsequent group comparisons. If set to 'off', auth_ldap uses the string"
                  "provided by the client directly. Defaults to 'on'."),
@@ -795,16 +795,16 @@ command_rec mod_auth_ldap_cmds[] = {
                   "Defaults to always."),
 
     AP_INIT_FLAG("AuthLDAPEnabled", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,
                  "Set to off to disable auth_ldap, even if it's been enabled in a higher tree"),
  
     AP_INIT_FLAG("AuthLDAPFrontPageHack", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,
                  "Set to 'on' to support Microsoft FrontPage"),
 
 #ifdef APU_HAS_LDAP_STARTTLS
     AP_INIT_FLAG("AuthLDAPStartTLS", ap_set_flag_slot,
-                 (void *)XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,
+                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,
                  "Set to 'on' to start TLS after connecting to the LDAP server."),
 #endif /* APU_HAS_LDAP_STARTTLS */
 

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index f48ae3285c75bc081d65122dd42a743c30f32201..5e3fa6d843b20b50fff6dc7ee6d3bf50aaa73e70 100644 (file)
--- 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 *) XtOffsetOf(autoindex_config_rec, default_icon),
+                  (void *) APR_XtOffsetOf(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 928f349aa82f59bbf6919078fe2941aadeb2eae3..1863a77acd160d88f53be1a5b6f89430af3a664b 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -464,10 +464,10 @@ AP_INIT_ITERATE2("AddLanguage", add_language, NULL, OR_FILEINFO,
 AP_INIT_ITERATE2("AddType", add_type, NULL, OR_FILEINFO, 
      "a mime type followed by one or more file extensions"),
 AP_INIT_TAKE1("DefaultLanguage", ap_set_string_slot,
-     (void*)XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
+     (void*)APR_XtOffsetOf(mime_dir_config, default_language), OR_FILEINFO,
      "language to use for documents with no other language file extension"),
 AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower, 
-     (void *)XtOffsetOf(mime_dir_config, type), OR_FILEINFO,
+     (void *)APR_XtOffsetOf(mime_dir_config, type), OR_FILEINFO,
      "a media type"),
 AP_INIT_ITERATE("RemoveCharset", remove_charset, NULL, OR_FILEINFO,
      "one or more file extensions"),
@@ -480,7 +480,7 @@ AP_INIT_ITERATE("RemoveLanguage", remove_language, NULL, OR_FILEINFO,
 AP_INIT_ITERATE("RemoveType", remove_type, NULL, OR_FILEINFO,
      "one or more file extensions"),
 AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower, 
-     (void *)XtOffsetOf(mime_dir_config, handler), OR_FILEINFO,
+     (void *)APR_XtOffsetOf(mime_dir_config, handler), OR_FILEINFO,
      "a handler name"),
 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 4bb21a823bbeca6adb8df0b2f40d742422f5ecff..2f2f2c86bb614ac14570921e6c9e425d8b194349 100644 (file)
--- 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 *) XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES,
+                  (void *) APR_XtOffsetOf(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 *) XtOffsetOf(imap_conf_rec, imap_default), OR_INDEXES,
+                  (void *) APR_XtOffsetOf(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 *) XtOffsetOf(imap_conf_rec, imap_base), OR_INDEXES,
+                  (void *) APR_XtOffsetOf(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 69a54174b4ac3954aeb98fd11f15332ad1dd6372..cb953f5ee5afb61fdf30804d622a7288dcc5a6cf 100644 (file)
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -63,7 +63,7 @@
  * UUencoding modified by: Alvaro Martinez Echevarria <alvaro@lander.es>
  */
 
-#include "apr_general.h"    /* for XtOffsetOf                */
+#include "apr_general.h"    /* for APR_XtOffsetOf                */
 
 #include "httpd.h"
 #include "http_config.h"
@@ -187,15 +187,15 @@ static void unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *p
     /*
      * Calculate the sizes and offsets in cur_unique_id.
      */
-    unique_id_rec_offset[0] = XtOffsetOf(unique_id_rec, stamp);
+    unique_id_rec_offset[0] = APR_XtOffsetOf(unique_id_rec, stamp);
     unique_id_rec_size[0] = sizeof(cur_unique_id.stamp);
-    unique_id_rec_offset[1] = XtOffsetOf(unique_id_rec, in_addr);
+    unique_id_rec_offset[1] = APR_XtOffsetOf(unique_id_rec, in_addr);
     unique_id_rec_size[1] = sizeof(cur_unique_id.in_addr);
-    unique_id_rec_offset[2] = XtOffsetOf(unique_id_rec, pid);
+    unique_id_rec_offset[2] = APR_XtOffsetOf(unique_id_rec, pid);
     unique_id_rec_size[2] = sizeof(cur_unique_id.pid);
-    unique_id_rec_offset[3] = XtOffsetOf(unique_id_rec, counter);
+    unique_id_rec_offset[3] = APR_XtOffsetOf(unique_id_rec, counter);
     unique_id_rec_size[3] = sizeof(cur_unique_id.counter);
-    unique_id_rec_offset[4] = XtOffsetOf(unique_id_rec, thread_index);
+    unique_id_rec_offset[4] = APR_XtOffsetOf(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/modules/test/mod_autoindex.c b/modules/test/mod_autoindex.c
index 7489164148bb96fb474d01d00ad6efd599e2c5cc..a57f037300c455cb69d86a00c219be2e36c87b99 100644 (file)
--- a/modules/test/mod_autoindex.c
+++ b/modules/test/mod_autoindex.c
@@ -582,7 +582,7 @@ static const command_rec autoindex_cmds[] =
     AP_INIT_FLAG("FancyIndexing", fancy_indexing, NULL, DIR_CMD_PERMS,
                  "Limited to 'on' or 'off' (superseded by IndexOptions FancyIndexing)"),
     AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,
-                  (void *) XtOffsetOf(autoindex_config_rec, default_icon),
+                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),
                   DIR_CMD_PERMS, "an icon URL"),
     {NULL}
 };

diff --git a/server/core.c b/server/core.c
index e7cd0fd21b46b6e2d0c8049c29c5d2cd24a164c5..880708e95f794141a448d2be91a49ba0a5ba1004 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -2709,7 +2709,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*)XtOffsetOf(core_dir_config, ap_auth_type), OR_AUTHCFG, 
+  (void*)APR_XtOffsetOf(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\")"),
@@ -2738,7 +2738,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*)XtOffsetOf (core_dir_config, ap_default_type),
+  (void*)APR_XtOffsetOf (core_dir_config, ap_default_type),
   OR_FILEINFO, "the default MIME type for untypable files"),
 
 /* Old server config file commands */
@@ -2749,17 +2749,17 @@ 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 *)XtOffsetOf (server_rec, server_admin), RSRC_CONF,
+  (void *)APR_XtOffsetOf (server_rec, server_admin), RSRC_CONF,
   "The email address of the server administrator"),
 AP_INIT_TAKE1("ServerName", set_server_string_slot,
-  (void *)XtOffsetOf (server_rec, server_hostname), RSRC_CONF,
+  (void *)APR_XtOffsetOf (server_rec, server_hostname), RSRC_CONF,
   "The hostname of the server"),
 AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL,
   "En-/disable server signature (on|off|email)"),
 AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF,
   "Common directory of server-related files (logs, confs, etc.)"),
 AP_INIT_TAKE1("ErrorLog", set_server_string_slot,
-  (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF,
+  (void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF,
   "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"),
@@ -2802,7 +2802,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*)XtOffsetOf(core_dir_config, limit_req_body), OR_ALL,
+  (void*)APR_XtOffsetOf(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 "
@@ -2811,7 +2811,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*)XtOffsetOf(core_dir_config, limit_cpu),
+  (void*)APR_XtOffsetOf(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,
@@ -2819,7 +2819,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*)XtOffsetOf(core_dir_config, limit_mem),
+  (void*)APR_XtOffsetOf(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,
@@ -2827,7 +2827,7 @@ AP_INIT_TAKE12("RLimitMEM", no_set_limit, NULL,
 #endif
 #ifdef RLIMIT_NPROC
 AP_INIT_TAKE12("RLimitNPROC", set_limit_nproc,
-  (void*)XtOffsetOf(core_dir_config, limit_nproc),
+  (void*)APR_XtOffsetOf(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,

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 0fe46a3a8580e7e60059c62f13714c8d9eef30ff..9c35747366771a10b085a1221a0c8817d8cf933e 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -918,7 +918,7 @@ static int make_child(server_rec *s, int slot)
 
     ap_scoreboard_image->parent[slot].pid = pid;
 #ifdef SCOREBOARD_FILE
-    lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[slot]), 0);
+    lseek(scoreboard_fd, APR_XtOffsetOf(scoreboard, parent[slot]), 0);
     force_write(scoreboard_fd, &ap_scoreboard_image->parent[slot],
                sizeof(process_score));
 #endif