diff options
Diffstat (limited to 'srclib/apr/include/arch/unix/apr_private.h.in')
| -rw-r--r-- | srclib/apr/include/arch/unix/apr_private.h.in | 78 |
1 files changed, 60 insertions, 18 deletions
diff --git a/srclib/apr/include/arch/unix/apr_private.h.in b/srclib/apr/include/arch/unix/apr_private.h.in index bc232cfd..9616ab53 100644 --- a/srclib/apr/include/arch/unix/apr_private.h.in +++ b/srclib/apr/include/arch/unix/apr_private.h.in @@ -8,6 +8,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if apr_allocator should use mmap */ +#undef APR_ALLOCATOR_USES_MMAP + /* Define as function which can be used for conversion of strings to apr_int64_t */ #undef APR_INT64_STRFN @@ -241,33 +244,15 @@ /* Define to 1 if you have the <langinfo.h> header file. */ #undef HAVE_LANGINFO_H -/* Enable if this library is available */ -#undef HAVE_LIBADVAPI32 - /* Define to 1 if you have the `bsd' library (-lbsd). */ #undef HAVE_LIBBSD -/* Enable if this library is available */ -#undef HAVE_LIBKERNEL32 - -/* Define to 1 if you have the `msvcrt' library (-lmsvcrt). */ -#undef HAVE_LIBMSVCRT - -/* Enable if this library is available */ -#undef HAVE_LIBRPCRT4 - /* Define to 1 if you have the `sendfile' library (-lsendfile). */ #undef HAVE_LIBSENDFILE -/* Enable if this library is available */ -#undef HAVE_LIBSHELL32 - /* Define to 1 if you have the `truerand' library (-ltruerand). */ #undef HAVE_LIBTRUERAND -/* Enable if this library is available */ -#undef HAVE_LIBWS2_32 - /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H @@ -760,6 +745,9 @@ /* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR +/* The size of ino_t */ +#undef SIZEOF_INO_T + /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT @@ -941,6 +929,60 @@ #endif /* + * Darwin 10's default compiler (gcc42) builds for both 64 and + * 32 bit architectures unless specifically told not to. + * In those cases, we need to override types depending on how + * we're being built at compile time. + * NOTE: This is an ugly work-around for Darwin's + * concept of universal binaries, a single package + * (executable, lib, etc...) which contains both 32 + * and 64 bit versions. The issue is that if APR is + * built universally, if something else is compiled + * against it, some bit sizes will depend on whether + * it is 32 or 64 bit. This is determined by the __LP64__ + * flag. Since we need to support both, we have to + * handle OS X unqiuely. + */ +#ifdef DARWIN_10 + +#undef APR_OFF_T_STRFN +#undef APR_INT64_STRFN +#undef SIZEOF_LONG +#undef SIZEOF_SIZE_T +#undef SIZEOF_SSIZE_T +#undef SIZEOF_VOIDP +#undef SIZEOF_STRUCT_IOVEC + +#ifdef __LP64__ + #define APR_INT64_STRFN strtol + #define SIZEOF_LONG 8 + #define SIZEOF_SIZE_T 8 + #define SIZEOF_SSIZE_T 8 + #define SIZEOF_VOIDP 8 + #define SIZEOF_STRUCT_IOVEC 16 +#else + #define APR_INT64_STRFN strtoll + #define SIZEOF_LONG 4 + #define SIZEOF_SIZE_T 4 + #define SIZEOF_SSIZE_T 4 + #define SIZEOF_VOIDP 4 + #define SIZEOF_STRUCT_IOVEC 8 +#endif + +#undef APR_OFF_T_STRFN +#define APR_OFF_T_STRFN APR_INT64_STRFN + + +#undef SETPGRP_VOID +#ifdef __DARWIN_UNIX03 + #define SETPGRP_VOID 1 +#else +/* #undef SETPGRP_VOID */ +#endif + +#endif /* DARWIN_10 */ + +/* * Include common private declarations. */ #include "../apr_private_common.h" |