Author: pquerna Date: Thu Jan 20 19:50:34 2005 New Revision: 125880 URL: http://svn.apache.org/viewcvs?view=rev&rev=125880 Log: Add Support for DragonFly BSD.
PR: #29858 Submitted By: Jeroen Ruigrok <asmodai tendra.org> Modified: apr/apr/trunk/dso/unix/dso.c apr/apr/trunk/include/arch/unix/apr_arch_dso.h apr/apr/trunk/network_io/unix/sendrecv.c Modified: apr/apr/trunk/dso/unix/dso.c Url: http://svn.apache.org/viewcvs/apr/apr/trunk/dso/unix/dso.c?view=diff&rev=125880&p1=apr/apr/trunk/dso/unix/dso.c&r1=125879&p2=apr/apr/trunk/dso/unix/dso.c&r2=125880 ============================================================================== --- apr/apr/trunk/dso/unix/dso.c (original) +++ apr/apr/trunk/dso/unix/dso.c Thu Jan 20 19:50:34 2005 @@ -117,7 +117,8 @@ #elif defined(DSO_USE_DLFCN) #if defined(OSF1) || defined(SEQUENT) || defined(SNI) ||\ - (defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)) + (defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)) ||\ + defined(__DragonFly__) void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); #else Modified: apr/apr/trunk/include/arch/unix/apr_arch_dso.h Url: http://svn.apache.org/viewcvs/apr/apr/trunk/include/arch/unix/apr_arch_dso.h?view=diff&rev=125880&p1=apr/apr/trunk/include/arch/unix/apr_arch_dso.h&r1=125879&p2=apr/apr/trunk/include/arch/unix/apr_arch_dso.h&r2=125880 ============================================================================== --- apr/apr/trunk/include/arch/unix/apr_arch_dso.h (original) +++ apr/apr/trunk/include/arch/unix/apr_arch_dso.h Thu Jan 20 19:50:34 2005 @@ -44,7 +44,8 @@ #define RTLD_GLOBAL 0 #endif -#if (defined(__FreeBSD__) ||\ +#if (defined(__DragonFly__) ||\ + defined(__FreeBSD__) ||\ defined(__OpenBSD__) ||\ defined(__NetBSD__) ) && !defined(__ELF__) #define DLSYM_NEEDS_UNDERSCORE Modified: apr/apr/trunk/network_io/unix/sendrecv.c Url: http://svn.apache.org/viewcvs/apr/apr/trunk/network_io/unix/sendrecv.c?view=diff&rev=125880&p1=apr/apr/trunk/network_io/unix/sendrecv.c&r1=125879&p2=apr/apr/trunk/network_io/unix/sendrecv.c&r2=125880 ============================================================================== --- apr/apr/trunk/network_io/unix/sendrecv.c (original) +++ apr/apr/trunk/network_io/unix/sendrecv.c Thu Jan 20 19:50:34 2005 @@ -387,7 +387,7 @@ return rv < 0 ? errno : APR_SUCCESS; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) /* Release 3.1 or greater */ apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file, @@ -406,7 +406,7 @@ hdtr = &no_hdtr; } -#if __FreeBSD_version < 460001 +#if defined(__FreeBSD_version) && __FreeBSD_version < 460001 else if (hdtr->numheaders) { /* On early versions of FreeBSD sendfile, the number of bytes to send @@ -953,6 +953,7 @@ #error APR has detected sendfile on your system, but nobody has written a #error version of it for APR yet. To get past this, either write #error apr_socket_sendfile or change APR_HAS_SENDFILE in apr.h to 0. -#endif /* __linux__, __FreeBSD__, __HPUX__, _AIX, __MVS__, Tru64/OSF1 */ +#endif /* __linux__, __FreeBSD__, __DragonFly__, __HPUX__, _AIX, __MVS__, + Tru64/OSF1 */ #endif /* APR_HAS_SENDFILE */
