From lauren93@example.org Thu Apr 07 00:27:07 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 59797 invoked from network); 7 Apr 2005 00:27:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 7 Apr 2005 00:27:07 -0000 Received: (qmail 66824 invoked by uid 500); 7 Apr 2005 00:27:06 -0000 Delivered-To: lauren93@example.org Received: (qmail 66784 invoked by uid 500); 7 Apr 2005 00:27:05 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 66771 invoked by uid 99); 7 Apr 2005 00:27:05 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 06 Apr 2005 17:27:05 -0700 Received: (qmail 59754 invoked by uid 65534); 7 Apr 2005 00:27:04 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 07 Apr 2005 00:27:04 -0000 Subject: svn commit: r160349 - in apr/apr/trunk: CHANGES apr.pc.in To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Wed Apr 6 17:27:03 2005 New Revision: 160349 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D160349 Log: fix the apr.pc.in file to include the cppflags in the Cflags varaible. It seems braindead, but pkg-config requires this, and it is a documented be= havoir. Modified: apr/apr/trunk/CHANGES apr/apr/trunk/apr.pc.in Modified: apr/apr/trunk/CHANGES URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?view=3Ddiff&r1=3D1= 60348&r2=3D160349 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/CHANGES (original) +++ apr/apr/trunk/CHANGES Wed Apr 6 17:27:03 2005 @@ -1,5 +1,7 @@ Changes for APR 1.2.0 =20 + *) Include the C preprocessor flags in --cflags for pkg-config. + [Paul Querna] =20 Changes for APR 1.1.1 =20 Modified: apr/apr/trunk/apr.pc.in URL: http://svn.apache.org/viewcvs/apr/apr/trunk/apr.pc.in?view=3Ddiff&r1= =3D160348&r2=3D160349 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/apr.pc.in (original) +++ apr/apr/trunk/apr.pc.in Wed Apr 6 17:27:03 2005 @@ -8,4 +8,4 @@ Description: The Apache Portable Runtime library Version: @APR_DOTTED_VERSION@ Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@ -Cflags: @EXTRA_CFLAGS@ -I${includedir} +Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir} From lauren93@example.org Tue Apr 12 18:38:26 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 55048 invoked from network); 12 Apr 2005 18:38:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 12 Apr 2005 18:38:26 -0000 Received: (qmail 14108 invoked by uid 500); 12 Apr 2005 18:38:25 -0000 Delivered-To: lauren93@example.org Received: (qmail 14041 invoked by uid 500); 12 Apr 2005 18:38:24 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 14023 invoked by uid 99); 12 Apr 2005 18:38:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 12 Apr 2005 11:38:24 -0700 Received: (qmail 54984 invoked by uid 65534); 12 Apr 2005 18:38:22 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 12 Apr 2005 18:38:22 -0000 Subject: svn commit: r161087 - in apr/apr-util/branches/0.9.x: CHANGES include/apr_reslist.h misc/apr_reslist.c To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Tue Apr 12 11:38:21 2005 New Revision: 161087 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161087 Log: Backport apr_reslist_timeout_set and apr_reslist_invalidate. These functions have been in 1.x for a long time. I am personally=20 using them in apr_memcache, and lacking apr_reslist_invalidate=20 was the only reason I had to require APR 1.x. The FreeBSD Ports have been applying a similar patch to backport these=20 changes. Modified: apr/apr-util/branches/0.9.x/CHANGES apr/apr-util/branches/0.9.x/include/apr_reslist.h apr/apr-util/branches/0.9.x/misc/apr_reslist.c Modified: apr/apr-util/branches/0.9.x/CHANGES URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?view= =3Ddiff&r1=3D161086&r2=3D161087 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/branches/0.9.x/CHANGES (original) +++ apr/apr-util/branches/0.9.x/CHANGES Tue Apr 12 11:38:21 2005 @@ -1,5 +1,8 @@ Changes with APR-util 0.9.7 =20 + *) Backport the apr_reslist_timeout_set and apr_reslist_invalidate=20 + functions already in APR 1.0.x. [Paul Querna] + *) Fix linking problem on cygwin. [Max Bowsher <maxb ukf.net>] =20 Changes with APR-util 0.9.6 Modified: apr/apr-util/branches/0.9.x/include/apr_reslist.h URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/include/apr_= reslist.h?view=3Ddiff&r1=3D161086&r2=3D161087 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/branches/0.9.x/include/apr_reslist.h (original) +++ apr/apr-util/branches/0.9.x/include/apr_reslist.h Tue Apr 12 11:38:21 2= 005 @@ -112,6 +112,24 @@ APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist, void *resource); =20 +/** + * Set the timeout the acquire will wait for a free resource + * when the maximum number of resources is exceeded. + * @param reslist The resource list. + * @param timeout Timeout to wait. The zero waits forewer. + */ +APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, + apr_interval_time_t timeout); + +/** + * Invalidate a resource in the pool - e.g. a database connection + * that returns a "lost connection" error and can't be restored. + * Use this instead of apr_reslist_release if the resource is bad. + */ +APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, + void *resource); + + #ifdef __cplusplus } #endif Modified: apr/apr-util/branches/0.9.x/misc/apr_reslist.c URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/misc/apr_res= list.c?view=3Ddiff&r1=3D161086&r2=3D161087 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/branches/0.9.x/misc/apr_reslist.c (original) +++ apr/apr-util/branches/0.9.x/misc/apr_reslist.c Tue Apr 12 11:38:21 2005 @@ -50,6 +50,7 @@ int smax; /* soft maximum on the total number of resources */ int hmax; /* hard maximum on the total number of resources */ apr_interval_time_t ttl; /* TTL when we have too many resources */ + apr_interval_time_t timeout; /* Timeout for waiting on resource */ apr_reslist_constructor constructor; apr_reslist_destructor destructor; void *params; /* opaque data passed to constructor and destructor call= s */ @@ -119,12 +120,9 @@ res =3D apr_pcalloc(reslist->pool, sizeof(*res)); =20 rv =3D reslist->constructor(&res->opaque, reslist->params, reslist->po= ol); - if (rv !=3D APR_SUCCESS) { - return rv; - } =20 *ret_res =3D res; - return APR_SUCCESS; + return rv; } =20 /** @@ -133,14 +131,7 @@ */ static apr_status_t destroy_resource(apr_reslist_t *reslist, apr_res_t *re= s) { - apr_status_t rv; - - rv =3D reslist->destructor(res->opaque, reslist->params, reslist->pool= ); - if (rv !=3D APR_SUCCESS) { - return rv; - } - - return APR_SUCCESS; + return reslist->destructor(res->opaque, reslist->params, reslist->pool= ); } =20 static apr_status_t reslist_cleanup(void *data_) @@ -188,6 +179,7 @@ /* Create the resource */ rv =3D create_resource(reslist, &res); if (rv !=3D APR_SUCCESS) { + free_container(reslist, res); apr_thread_mutex_unlock(reslist->listlock); return rv; } @@ -314,7 +306,15 @@ * a new one, or something becomes free. */ else while (reslist->ntotal >=3D reslist->hmax && reslist->nidle <=3D 0) { - apr_thread_cond_wait(reslist->avail, reslist->listlock); + if (reslist->timeout) { + if ((rv =3D apr_thread_cond_timedwait(reslist->avail,=20 + reslist->listlock, reslist->timeout)) !=3D APR_SUCCESS) { + apr_thread_mutex_unlock(reslist->listlock); + return rv; + } + } + else + apr_thread_cond_wait(reslist->avail, reslist->listlock); } /* If we popped out of the loop, first try to see if there * are new resources available for immediate use. */ @@ -330,17 +330,13 @@ * a resource to fill the slot and use it. */ else { rv =3D create_resource(reslist, &res); - - if (rv !=3D APR_SUCCESS) { - apr_thread_mutex_unlock(reslist->listlock); - return rv; + if (rv =3D=3D APR_SUCCESS) { + reslist->ntotal++; + *resource =3D res->opaque; } - - reslist->ntotal++; - *resource =3D res->opaque; free_container(reslist, res); apr_thread_mutex_unlock(reslist->listlock); - return APR_SUCCESS; + return rv; } } =20 @@ -357,6 +353,23 @@ apr_thread_mutex_unlock(reslist->listlock); =20 return reslist_maint(reslist); +} + +APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, + apr_interval_time_t timeout) +{ + reslist->timeout =3D timeout; +} + +APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, + void *resource) +{ + apr_status_t ret; + apr_thread_mutex_lock(reslist->listlock); + ret =3D reslist->destructor(resource, reslist->params, reslist->pool); + reslist->ntotal--; + apr_thread_mutex_unlock(reslist->listlock); + return ret; } =20 #endif /* APR_HAS_THREADS */ From lauren93@example.org Wed Apr 13 23:12:03 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 70337 invoked from network); 13 Apr 2005 23:12:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 13 Apr 2005 23:12:03 -0000 Received: (qmail 48268 invoked by uid 500); 13 Apr 2005 23:12:02 -0000 Delivered-To: lauren93@example.org Received: (qmail 48243 invoked by uid 500); 13 Apr 2005 23:12:02 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 48228 invoked by uid 99); 13 Apr 2005 23:12:01 -0000 X-ASF-Spam-Status: No, hits=-8.9 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_50_75 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 13 Apr 2005 16:12:01 -0700 Received: (qmail 70303 invoked by uid 65534); 13 Apr 2005 23:12:00 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 13 Apr 2005 23:12:00 -0000 Subject: svn commit: r161234 - apr/apr/trunk/include/apr_errno.h To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Wed Apr 13 16:11:59 2005 New Revision: 161234 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161234 Log: Yes, these are depreciated, but lets not use C++ Comments. Modified: apr/apr/trunk/include/apr_errno.h Modified: apr/apr/trunk/include/apr_errno.h URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr_errno.h?view= =3Ddiff&r1=3D161233&r2=3D161234 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr_errno.h (original) +++ apr/apr/trunk/include/apr_errno.h Wed Apr 13 16:11:59 2005 @@ -883,7 +883,7 @@ || (s) =3D=3D APR_OS_START_SYSERR + SOCECONNABORTED) #define APR_STATUS_IS_ECONNRESET(s) ((s) =3D=3D APR_ECONNRESET \ || (s) =3D=3D APR_OS_START_SYSERR + SOCECONNRESET) -// XXX deprecated +/* XXX deprecated */ #define APR_STATUS_IS_ETIMEDOUT(s) ((s) =3D=3D APR_ETIMEDOUT \ || (s) =3D=3D APR_OS_START_SYSERR + SOCETIMEDOUT) =20 #undef APR_STATUS_IS_TIMEUP @@ -1019,7 +1019,7 @@ #define APR_STATUS_IS_ECONNRESET(s) ((s) =3D=3D APR_ECONNRESET \ || (s) =3D=3D APR_OS_START_SYSERR + ERROR_NETNAME_DELETED \ || (s) =3D=3D APR_OS_START_SYSERR + WSAECONNRESET) -// XXX deprecated +/* XXX deprecated */ #define APR_STATUS_IS_ETIMEDOUT(s) ((s) =3D=3D APR_ETIMEDOUT \ || (s) =3D=3D APR_OS_START_SYSERR + WSAETIMEDOUT \ || (s) =3D=3D APR_OS_START_SYSERR + WAIT_TIMEOUT) @@ -1087,7 +1087,7 @@ || (s) =3D=3D APR_OS_START_SYSERR + WSAECONNABORTED) #define APR_STATUS_IS_ECONNRESET(s) ((s) =3D=3D APR_ECONNRESET \ || (s) =3D=3D APR_OS_START_SYSERR + WSAECONNRESET) -// XXX deprecated +/* XXX deprecated */ #define APR_STATUS_IS_ETIMEDOUT(s) ((s) =3D=3D APR_ETIMEDOUT \ || (s) =3D=3D APR_OS_START_SYSERR + WSAETIMEDOUT \ || (s) =3D=3D APR_OS_START_SYSERR + WAIT_TIMEOUT) From lauren93@example.org Thu Apr 14 23:38:58 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 70140 invoked from network); 14 Apr 2005 23:38:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 14 Apr 2005 23:38:58 -0000 Received: (qmail 66615 invoked by uid 500); 14 Apr 2005 23:38:57 -0000 Delivered-To: lauren93@example.org Received: (qmail 66580 invoked by uid 500); 14 Apr 2005 23:38:57 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 66558 invoked by uid 99); 14 Apr 2005 23:38:56 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 16:38:56 -0700 Received: (qmail 70107 invoked by uid 65534); 14 Apr 2005 23:38:55 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 14 Apr 2005 23:38:55 -0000 Subject: svn commit: r161365 - in apr/apr/trunk: ./ build/ include/ include/arch/netware/ misc/netware/ misc/unix/ To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Thu Apr 14 16:38:52 2005 New Revision: 161365 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161365 Log: Allow Apache on NetWare to build using either the standard socket libraries= or the Winsock libraries. Modified: apr/apr/trunk/NWGNUmakefile apr/apr/trunk/build/NWGNUenvironment.inc apr/apr/trunk/build/NWGNUmakefile apr/apr/trunk/build/NWGNUtail.inc apr/apr/trunk/include/apr.hnw apr/apr/trunk/include/apr_errno.h apr/apr/trunk/include/arch/netware/apr_arch_networkio.h apr/apr/trunk/include/arch/netware/apr_private.h apr/apr/trunk/misc/netware/libprews.c apr/apr/trunk/misc/netware/start.c apr/apr/trunk/misc/unix/errorcodes.c Modified: apr/apr/trunk/NWGNUmakefile URL: http://svn.apache.org/viewcvs/apr/apr/trunk/NWGNUmakefile?view=3Ddiff&= r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/NWGNUmakefile (original) +++ apr/apr/trunk/NWGNUmakefile Thu Apr 14 16:38:52 2005 @@ -188,6 +188,7 @@ libcpre.o \ $(APRLIB) \ $(APRUTLIB) \ + $(APULDAPLIB) \ $(XMLLIB) \ $(EOLIST) =20 @@ -197,9 +198,14 @@ # FILES_nlm_modules =3D \ Libc \ - ws2_32 \ $(EOLIST) -=09 + +# Include the Winsock libraries if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_modules +=3D ws2_32 \ + $(EOLIST) +endif + #If the LDAP support is defined then add the auto-load modules ifneq "$(LDAPSDK)" "" FILES_nlm_modules +=3D \ @@ -208,7 +214,6 @@ lldapx \ $(EOLIST) endif -=20 =20 # # If the nlm has a msg file, put it's path here @@ -230,11 +235,17 @@ # FILES_nlm_Ximports =3D \ @libc.imp \ - @ws2nlm.imp \ @netware.imp \ + $(EOLIST) +=09 +# Include the Winsock imports if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports +=3D \ + @ws2nlm.imp \ WSAStartupRTags \ WSACleanupRTag \ $(EOLIST) +endif =20 #If the LDAP support is defined then add the imports ifneq "$(LDAPSDK)" "" @@ -370,8 +381,15 @@ =20 vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/net= ware -vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:network_io/win32 -vpath %.c network_io/unix:poll/unix:shmem\unix:support/unix:random/unix +vpath %.c poll/unix:shmem\unix:support/unix:random/unix +vpath %.c dso/netware:memory/unix:mmap/unix:user/netware + +# Use the win32 network_io if Winsock is being used +ifdef USE_STDSOCKETS +vpath %.c network_io/unix +else +vpath %.c network_io/win32:network_io/unix +endif =20 $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo Compiling $< Modified: apr/apr/trunk/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUenvironment.inc= ?view=3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/build/NWGNUenvironment.inc (original) +++ apr/apr/trunk/build/NWGNUenvironment.inc Thu Apr 14 16:38:52 2005 @@ -116,6 +116,9 @@ INCDIRS =3D $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)= \include\winsock; =20 DEFINES =3D -DNETWARE +ifndef USE_STDSOCKETS +DEFINES +=3D -DUSE_WINSOCK +endif =20 # # MetroWerks static Libraries @@ -262,10 +265,11 @@ # Common directories # =20 -APR =3D $(APR_WORK) +APR =3D $(APR_WORK) APRTEST =3D $(APR_WORK)/test APRUTIL =3D $(APU_WORK) -XML =3D $(APRUTIL)/xml +APULDAP =3D $(APU_WORK)/ldap +XML =3D $(APRUTIL)/xml =20 # # Internal Libraries @@ -273,6 +277,7 @@ =20 APRLIB =3D $(APR)/$(OBJDIR)/aprlib.lib APRUTLIB =3D $(APRUTIL)/$(OBJDIR)/aprutil.lib +APULDAPLIB =3D $(APULDAP)/$(OBJDIR)/apuldap.lib XMLLIB =3D $(XML)/$(OBJDIR)/xmllib.lib =20 # Modified: apr/apr/trunk/build/NWGNUmakefile URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUmakefile?view= =3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/build/NWGNUmakefile (original) +++ apr/apr/trunk/build/NWGNUmakefile Thu Apr 14 16:38:52 2005 @@ -42,7 +42,7 @@ @echo -EP >> $@ @echo -nosyspath >> $@ @echo -w nocmdline >> $@ - @echo -DNETWARE >> $@ + @echo $(DEFINES) -DGENEXPORTS >> $@ @echo -I$(APR)\include >> $@ @echo -I$(APR)\include\arch\netware >> $@ @echo -I$(APR)\include\arch\unix >> $@ Modified: apr/apr/trunk/build/NWGNUtail.inc URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUtail.inc?view= =3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/build/NWGNUtail.inc (original) +++ apr/apr/trunk/build/NWGNUtail.inc Thu Apr 14 16:38:52 2005 @@ -234,6 +234,7 @@ endif @echo -l $(APR)/$(OBJDIR) >> $@ @echo -l $(APRUTIL)/$(OBJDIR) >> $@ + @echo -l $(APULDAP)/$(OBJDIR) >> $@ @echo -l $(XML)/$(OBJDIR) >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runti= me" >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C= ++" >> $@ Modified: apr/apr/trunk/include/apr.hnw URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.hnw?view=3Ddif= f&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr.hnw (original) +++ apr/apr/trunk/include/apr.hnw Thu Apr 14 16:38:52 2005 @@ -51,7 +51,11 @@ #include <nks/synch.h> #include <nks/time.h> #include <signal.h> +#ifdef USE_WINSOCK #include <novsock2.h> +#else +#include <sys/socket.h> +#endif #include <sys/types.h> =20 #ifdef NW_BUILD_IPV6 @@ -89,8 +93,15 @@ #define APR_HAVE_FCNTL_H 1 #define APR_HAVE_IO_H 0 #define APR_HAVE_LIMITS_H 1 +#ifdef USE_WINSOCK +#define APR_HAVE_ARPA_INET_H 0 #define APR_HAVE_NETDB_H 0 #define APR_HAVE_NETINET_IN_H 0 +#else +#define APR_HAVE_ARPA_INET_H 1 +#define APR_HAVE_NETDB_H 1 +#define APR_HAVE_NETINET_IN_H 1 +#endif #define APR_HAVE_NETINET_SCTP_H 0 #define APR_HAVE_NETINET_SCTP_UIO_H 0 #define APR_HAVE_NETINET_TCP_H 0 @@ -104,15 +115,21 @@ #define APR_HAVE_STRINGS_H 0 #define APR_HAVE_STRTOLL 1 #define APR_HAVE_SYS_SENDFILE_H 0 -#define APR_HAVE_SYS_SIGNAL_H 0 +#define APR_HAVE_SYS_SYSLIMITS_H 0 +#ifdef USE_WINSOCK #define APR_HAVE_SYS_SOCKET_H 0 #define APR_HAVE_SYS_SOCKIO_H 0 -#define APR_HAVE_SYS_SYSLIMITS_H 0 #define APR_HAVE_SYS_TIME_H 0 +#else +#define APR_HAVE_SYS_SOCKET_H 1 +#define APR_HAVE_SYS_SOCKIO_H 1 +#define APR_HAVE_SYS_TIME_H 1 +#endif +#define APR_HAVE_SYS_SIGNAL_H 1 #define APR_HAVE_SYS_TYPES_H 1 #define APR_HAVE_SYS_UIO_H 1 -#define APR_HAVE_SYS_UN_H 0 -#define APR_HAVE_SYS_WAIT_H 0 +#define APR_HAVE_SYS_UN_H 1 +#define APR_HAVE_SYS_WAIT_H 1 #define APR_HAVE_TIME_H 1 #define APR_HAVE_UNISTD_H 1 =20 @@ -232,7 +249,11 @@ #else typedef off_t apr_off_t; #endif +#ifdef USE_WINSOCK typedef int apr_socklen_t; +#else +typedef size_t apr_socklen_t; +#endif =20 /* Are we big endian? */ /* XXX: Fatal assumption on Alpha platforms */ Modified: apr/apr/trunk/include/apr_errno.h URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr_errno.h?view= =3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr_errno.h (original) +++ apr/apr/trunk/include/apr_errno.h Thu Apr 14 16:38:52 2005 @@ -1046,7 +1046,7 @@ #define APR_STATUS_IS_ENOTEMPTY(s) ((s) =3D=3D APR_ENOTEMPTY \ || (s) =3D=3D APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY) =20 -#elif defined(NETWARE) && !defined(DOXYGEN) /* !defined(OS2) && !defined(W= IN32) */ +#elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !de= fined(OS2) && !defined(WIN32) */ =20 #define APR_FROM_OS_ERROR(e) (e =3D=3D 0 ? APR_SUCCESS : e + APR_OS_START_= SYSERR) #define APR_TO_OS_ERROR(e) (e =3D=3D 0 ? APR_SUCCESS : e - APR_OS_START_= SYSERR) Modified: apr/apr/trunk/include/arch/netware/apr_arch_networkio.h URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/arch/netware/apr_a= rch_networkio.h?view=3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/arch/netware/apr_arch_networkio.h (original) +++ apr/apr/trunk/include/arch/netware/apr_arch_networkio.h Thu Apr 14 16:3= 8:52 2005 @@ -16,12 +16,16 @@ =20 #ifndef NETWORK_IO_H =20 +#ifdef USE_WINSOCK /* Making sure that we include the correct networkio.h since the the project file is configured to first look for headers in arch/netware and then arch/unix. But in this specific case we=20 want arch/win32. */ #include <../win32/apr_arch_networkio.h> +#else +#include <../unix/apr_arch_networkio.h> +#endif =20 #endif /* ! NETWORK_IO_H */ =20 Modified: apr/apr/trunk/include/arch/netware/apr_private.h URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/arch/netware/apr_p= rivate.h?view=3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/arch/netware/apr_private.h (original) +++ apr/apr/trunk/include/arch/netware/apr_private.h Thu Apr 14 16:38:52 20= 05 @@ -46,6 +46,10 @@ #define HAVE_SIGNAL_H 1 #define HAVE_STDDEF_H 1 #define HAVE_STDLIB_H 1 +#ifndef USE_WINSOCK +#define HAVE_SYS_SELECT_H 1 +#define HAVE_WRITEV 1 +#endif #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_MMAN_H 1 #define HAVE_FCNTL_H 1 Modified: apr/apr/trunk/misc/netware/libprews.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/netware/libprews.c?vi= ew=3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/misc/netware/libprews.c (original) +++ apr/apr/trunk/misc/netware/libprews.c Thu Apr 14 16:38:52 2005 @@ -16,7 +16,9 @@ #include <netware.h> #include <library.h> #include <nks/synch.h> +#ifdef USE_WINSOCK #include "novsock2.h" +#endif =20 #include "apr_pools.h" #include "apr_private.h" @@ -58,7 +60,9 @@ #pragma unused(messageCount) #pragma unused(messages) =20 +#ifdef USE_WINSOCK WSADATA wsaData; +#endif apr_status_t status; =20 gLibId =3D register_library(DisposeLibraryData); @@ -84,14 +88,20 @@ if ((status =3D apr_pool_initialize()) !=3D APR_SUCCESS) return status; =20 +#ifdef USE_WINSOCK return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData); +#else + return 0; +#endif } =20 void _NonAppStop( void ) { apr_pool_terminate(); =20 +#ifdef USE_WINSOCK WSACleanup(); +#endif =20 unregister_library(gLibId); NXMutexFree(gLibLock); Modified: apr/apr/trunk/misc/netware/start.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/netware/start.c?view= =3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/misc/netware/start.c (original) +++ apr/apr/trunk/misc/netware/start.c Thu Apr 14 16:38:52 2005 @@ -23,6 +23,7 @@ #include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ #include "apr_arch_internal_time.h" =20 +#ifdef USE_WINSOCK /* ** Resource tag signatures for using NetWare WinSock 2. These will no long= er ** be needed by anyone once the new WSAStartupWithNlmHandle() is available @@ -103,6 +104,7 @@ =20 return err; } +#endif =20 =20 =20 @@ -140,11 +142,13 @@ =20 apr_pool_tag(pool, "apr_initilialize"); =20 +#ifdef USE_WINSOCK err =3D RegisterAppWithWinSock (nlmhandle); =20 if (err) { return err; } +#endif =20 apr_signal_init(pool); =20 @@ -173,7 +177,9 @@ away. */ netware_pool_proc_cleanup (); =20 +#ifdef USE_WINSOCK UnregisterAppWithWinSock (app_data->gs_nlmhandle); +#endif } =20 APR_DECLARE(void) apr_terminate2(void) Modified: apr/apr/trunk/misc/unix/errorcodes.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/unix/errorcodes.c?vie= w=3Ddiff&r1=3D161364&r2=3D161365 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/misc/unix/errorcodes.c (original) +++ apr/apr/trunk/misc/unix/errorcodes.c Thu Apr 14 16:38:52 2005 @@ -183,7 +183,7 @@ return stuffbuffer(buf, bufsize, result); =20 } =20 -#elif defined(WIN32) || defined(NETWARE) +#elif defined(WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) =20 static const struct { apr_status_t code; From lauren93@example.org Thu Apr 14 23:39:28 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 70304 invoked from network); 14 Apr 2005 23:39:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 14 Apr 2005 23:39:28 -0000 Received: (qmail 66990 invoked by uid 500); 14 Apr 2005 23:39:28 -0000 Delivered-To: lauren93@example.org Received: (qmail 66966 invoked by uid 500); 14 Apr 2005 23:39:27 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 66953 invoked by uid 99); 14 Apr 2005 23:39:27 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 16:39:27 -0700 Received: (qmail 70280 invoked by uid 65534); 14 Apr 2005 23:39:26 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 14 Apr 2005 23:39:26 -0000 Subject: svn commit: r161366 - in apr/apr-util/trunk: NWGNUmakefile include/apr_ldap.hnw To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Thu Apr 14 16:39:25 2005 New Revision: 161366 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161366 Log: Allow APR-Util on NetWare to build using either the standard socket librari= es or the Winsock libraries. Modified: apr/apr-util/trunk/NWGNUmakefile apr/apr-util/trunk/include/apr_ldap.hnw Modified: apr/apr-util/trunk/NWGNUmakefile URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/NWGNUmakefile?view=3D= diff&r1=3D161365&r2=3D161366 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/trunk/NWGNUmakefile (original) +++ apr/apr-util/trunk/NWGNUmakefile Thu Apr 14 16:39:25 2005 @@ -3,6 +3,7 @@ # =20 SUBDIRS =3D \ + ldap \ xml \ $(EOLIST)=20 =20 @@ -243,9 +244,6 @@ $(OBJDIR)/apr_dbm_berkeleydb.o \ $(OBJDIR)/apr_dbm_sdbm.o \ $(OBJDIR)/apr_hooks.o \ - $(OBJDIR)/apr_ldap_init.o \ - $(OBJDIR)/apr_ldap_option.o \ - $(OBJDIR)/apr_ldap_url.o \ $(OBJDIR)/apr_md4.o \ $(OBJDIR)/apr_md5.o \ $(OBJDIR)/apr_queue.o \ Modified: apr/apr-util/trunk/include/apr_ldap.hnw URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/apr_ldap.hnw?= view=3Ddiff&r1=3D161365&r2=3D161366 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/trunk/include/apr_ldap.hnw (original) +++ apr/apr-util/trunk/include/apr_ldap.hnw Thu Apr 14 16:39:25 2005 @@ -63,10 +63,14 @@ * Include the standard LDAP header files. */ =20 +#ifdef GENEXPORTS +#define LDAP_VERSION_MAX 3 +#else #include <lber.h> #include <ldap.h> #if APR_HAS_LDAP_SSL=20 #include <ldap_ssl.h> +#endif #endif =20 =20 From lauren93@example.org Thu Apr 14 23:52:19 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 72200 invoked from network); 14 Apr 2005 23:52:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 14 Apr 2005 23:52:19 -0000 Received: (qmail 77336 invoked by uid 500); 14 Apr 2005 23:52:18 -0000 Delivered-To: lauren93@example.org Received: (qmail 77284 invoked by uid 500); 14 Apr 2005 23:52:18 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 77267 invoked by uid 99); 14 Apr 2005 23:52:18 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 16:52:18 -0700 Received: (qmail 72159 invoked by uid 65534); 14 Apr 2005 23:52:16 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 14 Apr 2005 23:52:16 -0000 Subject: svn commit: r161369 - apr/apr-util/trunk/ldap/NWGNUmakefile To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Thu Apr 14 16:52:15 2005 New Revision: 161369 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161369 Log: NetWare makefile to build apu-ldap as a library Added: apr/apr-util/trunk/ldap/NWGNUmakefile Added: apr/apr-util/trunk/ldap/NWGNUmakefile URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/NWGNUmakefile?vi= ew=3Dauto&rev=3D161369 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/trunk/ldap/NWGNUmakefile (added) +++ apr/apr-util/trunk/ldap/NWGNUmakefile Thu Apr 14 16:52:15 2005 @@ -0,0 +1,260 @@ +# +# Declare the sub-directories to be built here +# + +SUBDIRS =3D \ + $(EOLIST)=20 + +# +# Get the 'head' of the build environment. This includes default targets = and +# paths to tools +# + +include $(APR_WORK)\build\NWGNUhead.inc + +# +# build this level's files + +# +# Make sure all needed macro's are defined +# + +# +# These directories will be at the beginning of the include list, followed= by +# INCDIRS +# +XINCDIRS +=3D \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ + $(APRUTIL)/include \ + $(LDAPSDK)/inc \ + $(EOLIST) + +# +# These flags will come after CFLAGS +# +XCFLAGS +=3D \ + $(EOLIST) + +# +# These defines will come after DEFINES +# +XDEFINES +=3D \ + $(EOLIST) + +# +#LDAP client requires the use of Winsock +# +ifdef USE_STDSOCKETS +XDEFINES +=3D -DUSE_WINSOCK \ + $(EOLIST) +endif + +# +# These flags will be added to the link.opt file +# +XLFLAGS +=3D \ + $(EOLIST) + +# +# These values will be appended to the correct variables based on the valu= e of +# RELEASE +# +ifeq "$(RELEASE)" "debug" +XINCDIRS +=3D \ + $(EOLIST) + +XCFLAGS +=3D \ + $(EOLIST) + +XDEFINES +=3D \ + $(EOLIST) + +XLFLAGS +=3D \ + $(EOLIST) +endif + +ifeq "$(RELEASE)" "noopt" +XINCDIRS +=3D \ + $(EOLIST) + +XCFLAGS +=3D \ + $(EOLIST) + +XDEFINES +=3D \ + $(EOLIST) + +XLFLAGS +=3D \ + $(EOLIST) +endif + +ifeq "$(RELEASE)" "release" +XINCDIRS +=3D \ + $(EOLIST) + +XCFLAGS +=3D \ + $(EOLIST) + +XDEFINES +=3D \ + $(EOLIST) + +XLFLAGS +=3D \ + $(EOLIST) +endif + +# +# These are used by the link target if an NLM is being generated +# This is used by the link 'name' directive to name the nlm. If left blan= k +# TARGET_nlm (see below) will be used. +# +NLM_NAME =3D=20 + +# +# This is used by the link '-desc ' directive.=20 +# If left blank, NLM_NAME will be used. +# +NLM_DESCRIPTION =3D=20 + +# +# This is used by the '-threadname' directive. If left blank, +# NLM_NAME Thread will be used. +# +NLM_THREAD_NAME =3D=20 +# +# If this is specified, it will override VERSION value in=20 +# $(APR_WORK)\build\NWGNUenvironment.inc +# +NLM_VERSION =3D + +# +# If this is specified, it will override the default of 64K +# +NLM_STACK_SIZE =3D=20 + +# +# If this is specified it will be used by the link '-entry' directive +# +NLM_ENTRY_SYM =3D=20 + +# +# If this is specified it will be used by the link '-exit' directive +# +NLM_EXIT_SYM =3D=20 + +# +# If this is specified it will be used by the link '-check' directive +# +NLM_CHECK_SYM =3D + +# +# If this is specified it will be used by the link '-flags' directive +# +NLM_FLAGS =3D +=20 +# +# If this is specified it will be linked in with the XDCData option in the= def=20 +# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData = can=20 +# be disabled by setting APACHE_UNIPROC in the environment +# +XDCDATA =3D=20 + +# +# Declare all target files (you must add your files here) +# + +# +# If there is an NLM target, put it here +# +TARGET_nlm =3D \ + $(EOLIST) + +# +# If there is an LIB target, put it here +# +TARGET_lib =3D \ + $(OBJDIR)/apuldap.lib \ + $(EOLIST) + +# +# These are the OBJ files needed to create the NLM target above. +# Paths must all use the '/' character +# +FILES_nlm_objs =3D \ + $(EOLIST) + +# +# These are the LIB files needed to create the NLM target above. +# These will be added as a library command in the link.opt file. +# +FILES_nlm_libs =3D \ + $(EOLIST) + +# +# These are the modules that the above NLM target depends on to load. +# These will be added as a module command in the link.opt file. +# +FILES_nlm_modules =3D \ + $(EOLIST) + +# +# If the nlm has a msg file, put it's path here +# +FILE_nlm_msg =3D +=20 +# +# If the nlm has a hlp file put it's path here +# +FILE_nlm_hlp =3D + +# +# If this is specified, it will override the default copyright. +# +FILE_nlm_copyright =3D + +# +# Any additional imports go here +# +FILES_nlm_Ximports =3D \ + $(EOLIST) +=20 +# =20 +# Any symbols exported to here +# +FILES_nlm_exports =3D \ + $(EOLIST) +=09 +# =20 +# These are the OBJ files needed to create the LIB target above. +# Paths must all use the '/' character +# +FILES_lib_objs =3D \ + $(OBJDIR)/apr_ldap_init.o \ + $(OBJDIR)/apr_ldap_option.o \ + $(OBJDIR)/apr_ldap_url.o \ + $(EOLIST) + +# +# implement targets and dependancies (leave this section alone) +# + +libs 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 $(OBJDIR) $(TARGET_lib) + +nlms 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 libs $(TARGET_nlm) + +# +# Updated this target to create necessary directories and copy files to th= e=20 +# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples) +# +install 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 nlms FORCE + +# +# Any specialized rules here +# + +# +# Include the 'tail' makefile that has targets that depend on variables de= fined +# in this makefile +# + +include $(APR_WORK)\build\NWGNUtail.inc + From lauren93@example.org Fri Apr 15 16:47:17 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 11929 invoked from network); 15 Apr 2005 16:47:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 15 Apr 2005 16:47:17 -0000 Received: (qmail 49375 invoked by uid 500); 15 Apr 2005 16:47:04 -0000 Delivered-To: lauren93@example.org Received: (qmail 49276 invoked by uid 500); 15 Apr 2005 16:47:03 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 49205 invoked by uid 99); 15 Apr 2005 16:47:03 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 15 Apr 2005 09:47:02 -0700 Received: (qmail 11879 invoked by uid 65534); 15 Apr 2005 16:47:01 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 15 Apr 2005 16:47:01 -0000 Subject: svn commit: r161503 - apr/apr/branches/0.9.x/build/NWGNUtail.inc To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Fri Apr 15 09:47:00 2005 New Revision: 161503 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161503 Log: Update the link-time copyright statement Modified: apr/apr/branches/0.9.x/build/NWGNUtail.inc Modified: apr/apr/branches/0.9.x/build/NWGNUtail.inc URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/build/NWGNUtail.i= nc?view=3Ddiff&r1=3D161502&r2=3D161503 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/branches/0.9.x/build/NWGNUtail.inc (original) +++ apr/apr/branches/0.9.x/build/NWGNUtail.inc Fri Apr 15 09:47:00 2005 @@ -25,7 +25,7 @@ endif =20 ifndef NLM_COPYRIGHT -NLM_COPYRIGHT =3D Copyright (c) 2000-2004 The Apache Software Foundation. = All rights reserved. +NLM_COPYRIGHT =3D Copyright (c) 2000-2005 The Apache Software Foundation. = All rights reserved. endif =20 # From lauren93@example.org Fri Apr 15 16:47:29 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 12079 invoked from network); 15 Apr 2005 16:47:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 15 Apr 2005 16:47:29 -0000 Received: (qmail 51215 invoked by uid 500); 15 Apr 2005 16:47:28 -0000 Delivered-To: lauren93@example.org Received: (qmail 51173 invoked by uid 500); 15 Apr 2005 16:47:28 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 51159 invoked by uid 99); 15 Apr 2005 16:47:28 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 15 Apr 2005 09:47:27 -0700 Received: (qmail 12065 invoked by uid 65534); 15 Apr 2005 16:47:26 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 15 Apr 2005 16:47:26 -0000 Subject: svn commit: r161504 - apr/apr/trunk/build/NWGNUtail.inc To: lauren93@example.org From: lauren93@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Fri Apr 15 09:47:26 2005 New Revision: 161504 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161504 Log: Update the link-time copyright statement Modified: apr/apr/trunk/build/NWGNUtail.inc Modified: apr/apr/trunk/build/NWGNUtail.inc URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUtail.inc?view= =3Ddiff&r1=3D161503&r2=3D161504 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/build/NWGNUtail.inc (original) +++ apr/apr/trunk/build/NWGNUtail.inc Fri Apr 15 09:47:26 2005 @@ -25,7 +25,7 @@ endif =20 ifndef NLM_COPYRIGHT -NLM_COPYRIGHT =3D Copyright (c) 2000-2004 The Apache Software Foundation. = All rights reserved. +NLM_COPYRIGHT =3D Copyright (c) 2000-2005 The Apache Software Foundation. = All rights reserved. endif =20 # From lauren93@example.org Wed Apr 20 19:45:17 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 65173 invoked from network); 20 Apr 2005 19:45:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 20 Apr 2005 19:45:17 -0000 Received: (qmail 47205 invoked by uid 500); 20 Apr 2005 19:45:19 -0000 Delivered-To: lauren93@example.org Received: (qmail 47068 invoked by uid 500); 20 Apr 2005 19:45:18 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 47032 invoked by uid 99); 20 Apr 2005 19:45:18 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 20 Apr 2005 12:45:17 -0700 Received: (qmail 65126 invoked by uid 65534); 20 Apr 2005 19:45:09 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r162055 - /apr/apr/trunk/build/NWGNUenvironment.inc Date: Wed, 20 Apr 2005 19:45:09 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bnicholes Date: Wed Apr 20 12:45:08 2005 New Revision: 162055 URL: http://svn.apache.org/viewcvs?rev=3D162055&view=3Drev Log: use BSD sockets when building for IPV6 Modified: apr/apr/trunk/build/NWGNUenvironment.inc Modified: apr/apr/trunk/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUenvironment.inc= ?rev=3D162055&r1=3D162054&r2=3D162055&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/build/NWGNUenvironment.inc (original) +++ apr/apr/trunk/build/NWGNUenvironment.inc Wed Apr 20 12:45:08 2005 @@ -111,6 +111,12 @@ LINK =3D mwldnlm LIB =3D mwldnlm -type library -w nocmdline =20 +ifdef IPV6 +ifndef USE_STDSOCKETS +USE_STDSOCKETS=3D1 +endif +endif + NOVI =3D $(NOVELLLIBC)\imports =20 INCDIRS =3D $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)= \include\winsock; From lauren93@example.org Wed Apr 20 20:37:54 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 78820 invoked from network); 20 Apr 2005 20:37:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 20 Apr 2005 20:37:54 -0000 Received: (qmail 28065 invoked by uid 500); 20 Apr 2005 20:38:01 -0000 Delivered-To: lauren93@example.org Received: (qmail 28040 invoked by uid 500); 20 Apr 2005 20:37:59 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 28025 invoked by uid 99); 20 Apr 2005 20:37:59 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 20 Apr 2005 13:37:59 -0700 Received: (qmail 78775 invoked by uid 65534); 20 Apr 2005 20:37:50 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r162064 - /apr/apr/trunk/network_io/unix/sockopt.c Date: Wed, 20 Apr 2005 20:37:50 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jim Date: Wed Apr 20 13:37:50 2005 New Revision: 162064 URL: http://svn.apache.org/viewcvs?rev=3D162064&view=3Drev Log: Handle BEOS_R5 weirdness with gethostname() Modified: apr/apr/trunk/network_io/unix/sockopt.c Modified: apr/apr/trunk/network_io/unix/sockopt.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/network_io/unix/sockopt.c?= rev=3D162064&r1=3D162063&r2=3D162064&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/network_io/unix/sockopt.c (original) +++ apr/apr/trunk/network_io/unix/sockopt.c Wed Apr 20 13:37:50 2005 @@ -355,7 +355,11 @@ =20 apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont) { - if (gethostname(buf, len) =3D=3D -1) { +#ifdef BEOS_R5 + if (gethostname(buf, len) =3D=3D 0) { +#else + if (gethostname(buf, len) !=3D 0) { +#endif =20 buf[0] =3D '\0'; return errno; } From lauren93@example.org Thu Apr 21 18:59:29 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 25632 invoked from network); 21 Apr 2005 18:59:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 21 Apr 2005 18:59:28 -0000 Received: (qmail 63012 invoked by uid 500); 21 Apr 2005 18:59:46 -0000 Delivered-To: lauren93@example.org Received: (qmail 62980 invoked by uid 500); 21 Apr 2005 18:59:46 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 62962 invoked by uid 99); 21 Apr 2005 18:59:46 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 21 Apr 2005 11:59:45 -0700 Received: (qmail 25603 invoked by uid 65534); 21 Apr 2005 18:59:26 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164100 - /apr/apr/trunk/include/apr.hw Date: Thu, 21 Apr 2005 18:59:25 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Thu Apr 21 11:59:25 2005 New Revision: 164100 URL: http://svn.apache.org/viewcvs?rev=3D164100&view=3Drev Log: Set FD_SETSIZE to 1024 like POSIX does. This does not mean that more then 64 sockets will be allowed for select. Custom network protocol stack might dissreagard this setting. Modified: apr/apr/trunk/include/apr.hw Modified: apr/apr/trunk/include/apr.hw URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.hw?rev=3D16410= 0&r1=3D164099&r2=3D164100&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr.hw (original) +++ apr/apr/trunk/include/apr.hw Thu Apr 21 11:59:25 2005 @@ -86,6 +86,8 @@ */ #define SW_HIDE 0 #ifndef _WIN32_WCE +/* POSIX defines 1024 for the FD_SETSIZE */ +#define FD_SETSIZE 1024 #include <winsock2.h> #include <mswsock.h> #include <ws2tcpip.h> From lauren93@example.org Thu Apr 21 20:55:19 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 88355 invoked from network); 21 Apr 2005 20:55:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 21 Apr 2005 20:55:19 -0000 Received: (qmail 74516 invoked by uid 500); 21 Apr 2005 20:55:36 -0000 Delivered-To: lauren93@example.org Received: (qmail 74429 invoked by uid 500); 21 Apr 2005 20:55:34 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 74389 invoked by uid 99); 21 Apr 2005 20:55:34 -0000 X-ASF-Spam-Status: No, hits=0.1 required=10.0 tests=FORGED_RCVD_HELO X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from elephant.cnchost.com (HELO elephant.cnchost.com) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 21 Apr 2005 13:55:34 -0700 Received: from rcsv650.rowe-clan.net (c-24-13-128-132.hsd1.il.comcast.net [83.161.120.155]) by elephant.cnchost.com id QAA23557; Thu, 21 Apr 2005 16:55:12 -0400 (EDT) [ConcentricHost SMTP Relay 1.17] Errors-To: <lauren93@example.org> Message-Id: <lauren93@example.org> X-Mailer: QUALCOMM Windows Eudora Version 83.161.120.155 Date: Thu, 21 Apr 2005 14:33:40 -0500 To: lauren93@example.org From: "William A. Rowe, Jr." <lauren93@example.org> Subject: Re: svn commit: r164100 - /apr/apr/trunk/include/apr.hw Cc: lauren93@example.org In-Reply-To: <lauren93@example.org> References: <lauren93@example.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N The more I consider this proposition, the more inappropriate it appears. We are modifying not the APR environment, this patch modifies the native API. APR wasn't designed to change the native environment, but provide a rich crossplatform alternative. I'd prefer this is backed out. You won't break anything in your app by modifying the environment (e.g. your sources include the #define FD_SETSIZE 1024) followed by including APR. But you are asking APR to do something on Windows that we would not do on any other platform. Sorry that it had not occurred to me that the answer to your original question was independent of the apr_poll discussion. If you have need for changing this for APR's use, our include/arch/win32/ internals are the appropriate place. Bill >Author: mturk >Date: Thu Apr 21 11:59:25 2005 >New Revision: 164100 > >URL: http://svn.apache.org/viewcvs?rev=164100&view=rev >Log: >Set FD_SETSIZE to 1024 like POSIX does. >This does not mean that more then 64 sockets >will be allowed for select. Custom network protocol >stack might dissreagard this setting. > >Modified: > apr/apr/trunk/include/apr.hw > >Modified: apr/apr/trunk/include/apr.hw >URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.hw?rev=164100&r1=164099&r2=164100&view=diff >============================================================================== >--- apr/apr/trunk/include/apr.hw (original) >+++ apr/apr/trunk/include/apr.hw Thu Apr 21 11:59:25 2005 >@@ -86,6 +86,8 @@ > */ > #define SW_HIDE 0 > #ifndef _WIN32_WCE >+/* POSIX defines 1024 for the FD_SETSIZE */ >+#define FD_SETSIZE 1024 > #include <winsock2.h> > #include <mswsock.h> > #include <ws2tcpip.h> From lauren93@example.org Fri Apr 22 07:25:27 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 6084 invoked from network); 22 Apr 2005 07:25:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Apr 2005 07:25:27 -0000 Received: (qmail 37588 invoked by uid 500); 22 Apr 2005 07:25:48 -0000 Delivered-To: lauren93@example.org Received: (qmail 37538 invoked by uid 500); 22 Apr 2005 07:25:47 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 37524 invoked by uid 99); 22 Apr 2005 07:25:47 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 22 Apr 2005 00:25:47 -0700 Received: (qmail 6052 invoked by uid 65534); 22 Apr 2005 07:25:24 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164182 - in /apr/apr/trunk: include/apr.hw poll/unix/select.c Date: Fri, 22 Apr 2005 07:25:24 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Fri Apr 22 00:25:23 2005 New Revision: 164182 URL: http://svn.apache.org/viewcvs?rev=3D164182&view=3Drev Log: Remove setting FD_SETSIZE from apr.hw to select.c (the only place it is used). Modified: apr/apr/trunk/include/apr.hw apr/apr/trunk/poll/unix/select.c Modified: apr/apr/trunk/include/apr.hw URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr.hw?rev=3D16418= 2&r1=3D164181&r2=3D164182&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr.hw (original) +++ apr/apr/trunk/include/apr.hw Fri Apr 22 00:25:23 2005 @@ -86,8 +86,6 @@ */ #define SW_HIDE 0 #ifndef _WIN32_WCE -/* POSIX defines 1024 for the FD_SETSIZE */ -#define FD_SETSIZE 1024 #include <winsock2.h> #include <mswsock.h> #include <ws2tcpip.h> Modified: apr/apr/trunk/poll/unix/select.c URL: http://svn.apache.org/viewcvs/apr/apr/trunk/poll/unix/select.c?rev=3D1= 64182&r1=3D164181&r2=3D164182&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/poll/unix/select.c (original) +++ apr/apr/trunk/poll/unix/select.c Fri Apr 22 00:25:23 2005 @@ -14,6 +14,11 @@ * limitations under the License. */ =20 +#ifdef WIN32 +/* POSIX defines 1024 for the FD_SETSIZE */ +#define FD_SETSIZE 1024 +#endif + #include "apr.h" #include "apr_poll.h" #include "apr_time.h" From lauren93@example.org Fri Apr 22 07:30:05 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 7669 invoked from network); 22 Apr 2005 07:30:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Apr 2005 07:30:05 -0000 Received: (qmail 42132 invoked by uid 500); 22 Apr 2005 07:30:25 -0000 Delivered-To: lauren93@example.org Received: (qmail 42022 invoked by uid 500); 22 Apr 2005 07:30:25 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 41991 invoked by uid 99); 22 Apr 2005 07:30:24 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from mxout2.iskon.hr (HELO mxout2.iskon.hr) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 22 Apr 2005 00:30:24 -0700 Received: (qmail 7745 invoked from network); 22 Apr 2005 09:29:59 +0200 X-Remote-IP: 83.161.120.155 Received: from unknown (HELO mx.iskon.hr) (83.161.120.155) by mxout2.iskon.hr with SMTP; 22 Apr 2005 09:29:59 +0200 Received: (qmail 22102 invoked from network); 22 Apr 2005 09:29:59 +0200 X-Remote-IP: 83.161.120.155 Received: from lns01-0650.dsl.iskon.hr (HELO ?83.161.120.155?) (83.161.120.155) by mx.iskon.hr with SMTP; 22 Apr 2005 09:29:59 +0200 Message-ID: <lauren93@example.org> Date: Fri, 22 Apr 2005 09:29:57 +0200 From: Mladen Turk <lauren93@example.org> User-Agent: Mozilla X-Accept-Language: en-us, en MIME-Version: 1.0 To: lauren93@example.org CC: lauren93@example.org Subject: Re: svn commit: r164100 - /apr/apr/trunk/include/apr.hw References: <lauren93@example.org> <lauren93@example.org> In-Reply-To: <lauren93@example.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N William A. Rowe, Jr. wrote: > I'd prefer this is backed out. You won't break anything in your > app by modifying the environment (e.g. your sources include the > #define FD_SETSIZE 1024) followed by including APR. > This will not work, because the APR thinks there is only 64 limit for FD_SETSIZE. > But you are asking APR to do something on Windows that we would > not do on any other platform. > No I don't ask for anything like that. It's just the way how APR is compiled and with what options. You are even doing that in a much extended way by setting NOUSER, NOMCX, NOIME, etc... > Sorry that it had not occurred to me that the answer to your > original question was independent of the apr_poll discussion. > > If you have need for changing this for APR's use, our > include/arch/win32/ internals are the appropriate place. > The problem is that the FD_SETSIZE needs to be defined before including winsock2.h. Anyhow I removed the definition from apr.hw to select.c At the end, you can still have 'ab -c 200' on windows. Regards, Mladen. From lauren93@example.org Fri Apr 22 14:46:59 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 9130 invoked from network); 22 Apr 2005 14:46:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Apr 2005 14:46:59 -0000 Received: (qmail 51057 invoked by uid 500); 22 Apr 2005 14:47:18 -0000 Delivered-To: lauren93@example.org Received: (qmail 50945 invoked by uid 500); 22 Apr 2005 14:47:17 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 50911 invoked by uid 99); 22 Apr 2005 14:47:16 -0000 X-ASF-Spam-Status: No, hits=0.3 required=10.0 tests=DATE_IN_PAST_06_12,FORGED_RCVD_HELO X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from warspite.concentric.net (HELO warspite.cnchost.com) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Fri, 22 Apr 2005 07:47:16 -0700 Received: from rcsv650.rowe-clan.net (c-24-13-128-132.hsd1.il.comcast.net [83.161.120.155]) by warspite.cnchost.com id KAA22442; Fri, 22 Apr 2005 10:46:48 -0400 (EDT) [ConcentricHost SMTP Relay 1.17] Errors-To: <lauren93@example.org> Message-Id: <lauren93@example.org> X-Mailer: QUALCOMM Windows Eudora Version 83.161.120.155 Date: Fri, 22 Apr 2005 02:50:55 -0500 To: Mladen Turk <lauren93@example.org> From: "William A. Rowe, Jr." <lauren93@example.org> Subject: Re: svn commit: r164100 - /apr/apr/trunk/include/apr.hw Cc: lauren93@example.org, lauren93@example.org In-Reply-To: <lauren93@example.org> References: <lauren93@example.org> <lauren93@example.org> <lauren93@example.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N You can do this in select.c - you can also #include "apr_arch_networkio.h" up front, where that header then... #define FD_SETSIZE 1024 #include "apr.h" Either solution is fine - I'm happy with the most recent commit. Bill At 02:29 AM 4/22/2005, Mladen Turk wrote: >William A. Rowe, Jr. wrote: >>I'd prefer this is backed out. You won't break anything in your >>app by modifying the environment (e.g. your sources include the >>#define FD_SETSIZE 1024) followed by including APR. > >This will not work, because the APR thinks there is only 64 >limit for FD_SETSIZE. > >>But you are asking APR to do something on Windows that we would >>not do on any other platform. > >No I don't ask for anything like that. It's just the way how >APR is compiled and with what options. >You are even doing that in a much extended way by setting >NOUSER, NOMCX, NOIME, etc... > > >>Sorry that it had not occurred to me that the answer to your >>original question was independent of the apr_poll discussion. >>If you have need for changing this for APR's use, our include/arch/win32/ internals are the appropriate place. > >The problem is that the FD_SETSIZE needs to be defined before >including winsock2.h. > >Anyhow I removed the definition from apr.hw to select.c >At the end, you can still have 'ab -c 200' on windows. > >Regards, >Mladen. From lauren93@example.org Fri Apr 22 17:50:43 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 66154 invoked from network); 22 Apr 2005 17:50:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Apr 2005 17:50:43 -0000 Received: (qmail 34260 invoked by uid 500); 22 Apr 2005 17:51:09 -0000 Delivered-To: lauren93@example.org Received: (qmail 34227 invoked by uid 500); 22 Apr 2005 17:51:09 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 34213 invoked by uid 99); 22 Apr 2005 17:51:08 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 22 Apr 2005 10:51:08 -0700 Received: (qmail 66130 invoked by uid 65534); 22 Apr 2005 17:50:41 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164262 - /apr/apr/trunk/include/apr_tables.h Date: Fri, 22 Apr 2005 17:50:41 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Fri Apr 22 10:50:38 2005 New Revision: 164262 URL: http://svn.apache.org/viewcvs?rev=3D164262&view=3Drev Log: Fix the @return Docstring to say that this will return NULL if the key does= n't exist. Modified: apr/apr/trunk/include/apr_tables.h Modified: apr/apr/trunk/include/apr_tables.h URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr_tables.h?rev= =3D164262&r1=3D164261&r2=3D164262&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr/trunk/include/apr_tables.h (original) +++ apr/apr/trunk/include/apr_tables.h Fri Apr 22 10:50:38 2005 @@ -214,7 +214,7 @@ * The data is still in the table * @param t The table to search for the key * @param key The key to search for - * @return The value associated with the key + * @return The value associated with the key, or NULL if the key does not = exist.=20 */ APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *= key); =20 From lauren93@example.org Sat Apr 23 23:01:12 2005 Return-Path: <lauren93@example.org> Delivered-To: lauren93@example.org Received: (qmail 82884 invoked from network); 23 Apr 2005 23:01:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Apr 2005 23:01:12 -0000 Received: (qmail 81791 invoked by uid 500); 23 Apr 2005 23:01:40 -0000 Delivered-To: lauren93@example.org Received: (qmail 81676 invoked by uid 500); 23 Apr 2005 23:01:40 -0000 Mailing-List: contact lauren93@example.org; run by ezmlm Precedence: bulk List-Post: <mailto:lauren93@example.org> List-Help: <mailto:lauren93@example.org> List-Unsubscribe: <mailto:lauren93@example.org> List-Subscribe: <mailto:lauren93@example.org> Reply-To: lauren93@example.org Delivered-To: mailing list lauren93@example.org Received: (qmail 81660 invoked by uid 99); 23 Apr 2005 23:01:39 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 23 Apr 2005 16:01:39 -0700 Received: (qmail 82874 invoked by uid 65534); 23 Apr 2005 23:01:09 -0000 Message-ID: <lauren93@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164427 - /apr/apr-util/trunk/ldap/NWGNUmakefile Date: Sat, 23 Apr 2005 23:01:08 -0000 To: lauren93@example.org From: lauren93@example.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nd Date: Sat Apr 23 16:01:07 2005 New Revision: 164427 URL: http://svn.apache.org/viewcvs?rev=3D164427&view=3Drev Log: * apr-util/ldap/NWGNUmakefile svn:eol-style =3D native Modified: apr/apr-util/trunk/ldap/NWGNUmakefile (contents, props changed) Modified: apr/apr-util/trunk/ldap/NWGNUmakefile URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/NWGNUmakefile?re= v=3D164427&r1=3D164426&r2=3D164427&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-util/trunk/ldap/NWGNUmakefile (original) +++ apr/apr-util/trunk/ldap/NWGNUmakefile Sat Apr 23 16:01:07 2005 @@ -1,260 +1,260 @@ -# -# Declare the sub-directories to be built here -# - -SUBDIRS =3D \ - $(EOLIST)=20 - -# -# Get the 'head' of the build environment. This includes default targets = and -# paths to tools -# - -include $(APR_WORK)\build\NWGNUhead.inc - -# -# build this level's files - -# -# Make sure all needed macro's are defined -# - -# -# These directories will be at the beginning of the include list, followed= by -# INCDIRS -# -XINCDIRS +=3D \ - $(APR)/include \ - $(APR)/include/arch/NetWare \ - $(APRUTIL)/include \ - $(LDAPSDK)/inc \ - $(EOLIST) - -# -# These flags will come after CFLAGS -# -XCFLAGS +=3D \ - $(EOLIST) - -# -# These defines will come after DEFINES -# -XDEFINES +=3D \ - $(EOLIST) - -# -#LDAP client requires the use of Winsock -# -ifdef USE_STDSOCKETS -XDEFINES +=3D -DUSE_WINSOCK \ - $(EOLIST) -endif - -# -# These flags will be added to the link.opt file -# -XLFLAGS +=3D \ - $(EOLIST) - -# -# These values will be appended to the correct variables based on the valu= e of -# RELEASE -# -ifeq "$(RELEASE)" "debug" -XINCDIRS +=3D \ - $(EOLIST) - -XCFLAGS +=3D \ - $(EOLIST) - -XDEFINES +=3D \ - $(EOLIST) - -XLFLAGS +=3D \ - $(EOLIST) -endif - -ifeq "$(RELEASE)" "noopt" -XINCDIRS +=3D \ - $(EOLIST) - -XCFLAGS +=3D \ - $(EOLIST) - -XDEFINES +=3D \ - $(EOLIST) - -XLFLAGS +=3D \ - $(EOLIST) -endif - -ifeq "$(RELEASE)" "release" -XINCDIRS +=3D \ - $(EOLIST) - -XCFLAGS +=3D \ - $(EOLIST) - -XDEFINES +=3D \ - $(EOLIST) - -XLFLAGS +=3D \ - $(EOLIST) -endif - -# -# These are used by the link target if an NLM is being generated -# This is used by the link 'name' directive to name the nlm. If left blan= k -# TARGET_nlm (see below) will be used. -# -NLM_NAME =3D=20 - -# -# This is used by the link '-desc ' directive.=20 -# If left blank, NLM_NAME will be used. -# -NLM_DESCRIPTION =3D=20 - -# -# This is used by the '-threadname' directive. If left blank, -# NLM_NAME Thread will be used. -# -NLM_THREAD_NAME =3D=20 -# -# If this is specified, it will override VERSION value in=20 -# $(APR_WORK)\build\NWGNUenvironment.inc -# -NLM_VERSION =3D - -# -# If this is specified, it will override the default of 64K -# -NLM_STACK_SIZE =3D=20 - -# -# If this is specified it will be used by the link '-entry' directive -# -NLM_ENTRY_SYM =3D=20 - -# -# If this is specified it will be used by the link '-exit' directive -# -NLM_EXIT_SYM =3D=20 - -# -# If this is specified it will be used by the link '-check' directive -# -NLM_CHECK_SYM =3D - -# -# If this is specified it will be used by the link '-flags' directive -# -NLM_FLAGS =3D -=20 -# -# If this is specified it will be linked in with the XDCData option in the= def=20 -# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData = can=20 -# be disabled by setting APACHE_UNIPROC in the environment -# -XDCDATA =3D=20 - -# -# Declare all target files (you must add your files here) -# - -# -# If there is an NLM target, put it here -# -TARGET_nlm =3D \ - $(EOLIST) - -# -# If there is an LIB target, put it here -# -TARGET_lib =3D \ - $(OBJDIR)/apuldap.lib \ - $(EOLIST) - -# -# These are the OBJ files needed to create the NLM target above. -# Paths must all use the '/' character -# -FILES_nlm_objs =3D \ - $(EOLIST) - -# -# These are the LIB files needed to create the NLM target above. -# These will be added as a library command in the link.opt file. -# -FILES_nlm_libs =3D \ - $(EOLIST) - -# -# These are the modules that the above NLM target depends on to load. -# These will be added as a module command in the link.opt file. -# -FILES_nlm_modules =3D \ - $(EOLIST) - -# -# If the nlm has a msg file, put it's path here -# -FILE_nlm_msg =3D -=20 -# -# If the nlm has a hlp file put it's path here -# -FILE_nlm_hlp =3D - -# -# If this is specified, it will override the
{'source': 'Apache Software Foundation Public Mail Archives'}