diff options
| author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2001-08-19 05:45:41 +0000 |
|---|---|---|
| committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2001-08-19 05:45:41 +0000 |
| commit | 3ea690301d4e063a15cd333db7cfb897269ccaac (patch) | |
| tree | 37dd2bdcb039d977d53c7584f945519ab58f729b /include/apr_general.h | |
| parent | 41f314b1b486882106d348a229cced7be05864c9 (diff) | |
| download | libapr-3ea690301d4e063a15cd333db7cfb897269ccaac.tar.gz | |
Rename XtOffset to APR_XtOffset. This namespace protection
is important to keep from conflicting with other packages.
Submitted by: Doug MacEachern
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62198 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_general.h')
| -rw-r--r-- | include/apr_general.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/apr_general.h b/include/apr_general.h index 150aa513d..0fda82e76 100644 --- a/include/apr_general.h +++ b/include/apr_general.h @@ -90,29 +90,29 @@ typedef int apr_signum_t; #if defined(CRAY) || (defined(__arm) && !defined(LINUX)) #ifdef __STDC__ -#define XtOffset(p_type,field) _Offsetof(p_type,field) +#define APR_XtOffset(p_type,field) _Offsetof(p_type,field) #else #ifdef CRAY2 -#define XtOffset(p_type,field) \ +#define APR_XtOffset(p_type,field) \ (sizeof(int)*((unsigned int)&(((p_type)NULL)->field))) #else /* !CRAY2 */ -#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field)) +#define APR_XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field)) #endif /* !CRAY2 */ #endif /* __STDC__ */ #else /* ! (CRAY || __arm) */ -#define XtOffset(p_type,field) \ +#define APR_XtOffset(p_type,field) \ ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) #endif /* !CRAY */ #ifdef offsetof -#define XtOffsetOf(s_type,field) offsetof(s_type,field) +#define APR_XtOffsetOf(s_type,field) offsetof(s_type,field) #else -#define XtOffsetOf(s_type,field) XtOffset(s_type*,field) +#define APR_XtOffsetOf(s_type,field) APR_XtOffset(s_type*,field) #endif |