Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 97477 invoked from network); 17 Mar 2005 17:52:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Mar 2005 17:52:07 -0000 Received: (qmail 96041 invoked by uid 500); 17 Mar 2005 17:52:06 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 95998 invoked by uid 500); 17 Mar 2005 17:52:06 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 95985 invoked by uid 99); 17 Mar 2005 17:52:06 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 17 Mar 2005 09:52:06 -0800 Received: (qmail 97412 invoked by uid 65534); 17 Mar 2005 17:52:04 -0000 Message-ID: <20050317175204.97411.qmail@minotaur.apache.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, 17 Mar 2005 17:52:04 -0000 Subject: svn commit: r157949 - httpd/httpd/trunk/libhttpd.dsp To: cvs@httpd.apache.org From: wrowe@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: wrowe Date: Thu Mar 17 09:52:03 2005 New Revision: 157949 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157949 Log: Add /D PCRE_STATIC to solve an 'exported symbol imported' bug. We build pcre static, and do not intent to export pcre_* namespace, but rather our ap_pcre_* wrappers. Modified: httpd/httpd/trunk/libhttpd.dsp Modified: httpd/httpd/trunk/libhttpd.dsp URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/libhttpd.dsp?view=3Ddi= ff&r1=3D157948&r2=3D157949 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/libhttpd.dsp (original) +++ httpd/httpd/trunk/libhttpd.dsp Thu Mar 17 09:52:03 2005 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D= "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include"= /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /= D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include"= /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /= D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_c= l" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -57,7 +57,7 @@ # Begin Special Build Tool SOURCE=3D"$(InputPath)" PreLink_Desc=3DCompiling buildmark -PreLink_Cmds=3Dcl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/= include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "= WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c se= rver\buildmark.c /Fo"Release\buildmark.obj" +PreLink_Cmds=3Dcl.exe /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/= include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "= WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Release\li= bhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj" # End Special Build Tool =20 !ELSEIF "$(CFG)" =3D=3D "libhttpd - Win32 Debug" @@ -74,7 +74,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WI= NDOWS" /D "AP_DECLARE_EXPORT" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/inc= lude" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN= 32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd_cl" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./srclib/apr/inc= lude" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DEBUG" /D "WIN= 32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttp= d_cl" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -88,7 +88,7 @@ # Begin Special Build Tool SOURCE=3D"$(InputPath)" PreLink_Desc=3DCompiling buildmark -PreLink_Cmds=3Dcl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./sr= clib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DE= BUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /F= D /c server\buildmark.c /Fo"Debug\buildmark.obj" +PreLink_Cmds=3Dcl.exe /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./sr= clib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "_DE= BUG" /D "WIN32" /D "_WINDOWS" /D "PCRE_STATIC" /D "AP_DECLARE_EXPORT" /Fd"D= ebug\libhttpd" /FD /c server\buildmark.c /Fo"Debug\buildmark.obj" # End Special Build Tool =20 !ENDIF=20