You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/12/16 21:38:24 UTC
svn commit: r357224 - in /httpd/httpd/branches/2.2.x: Apache.dsw
Makefile.win STATUS modules/aaa/mod_authn_dbd.dsp
modules/database/mod_dbd.c modules/database/mod_dbd.dsp
modules/database/mod_dbd.h
Author: wrowe
Date: Fri Dec 16 12:38:12 2005
New Revision: 357224
URL: http://svn.apache.org/viewcvs?rev=357224&view=rev
Log:
Backport Win32 build fixes for mod_dbd and mod_authn_dbd
http://people.apache.org/~colm/httpd-2.2.0-dbd-win32.patch
Submitted by: colm
Reviewed by: pquerna, niq, wrowe
Added:
httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp (with props)
httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp (with props)
Modified:
httpd/httpd/branches/2.2.x/Apache.dsw
httpd/httpd/branches/2.2.x/Makefile.win
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h
Modified: httpd/httpd/branches/2.2.x/Apache.dsw
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Apache.dsw?rev=357224&r1=357223&r2=357224&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.2.x/Apache.dsw Fri Dec 16 12:38:12 2005
@@ -81,6 +81,9 @@
Project_Dep_Name mod_authn_anon
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_authn_dbd
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_authn_dbm
End Project Dependency
Begin Project Dependency
@@ -126,6 +129,9 @@
Project_Dep_Name mod_dav_fs
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_dbd
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_dir
End Project Dependency
Begin Project Dependency
@@ -747,6 +753,33 @@
###############################################################################
+Project: "mod_authn_dbd"=.\modules\aaa\mod_authn_dbd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_auth_basic
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_dbd
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "mod_authn_dbm"=.\modules\aaa\mod_authn_dbm.dsp - Package Owner=<4>
Package=<5>
@@ -1105,6 +1138,27 @@
End Project Dependency
Begin Project Dependency
Project_Dep_Name mod_dav
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_dbd"=.\modules\database\mod_dbd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
End Project Dependency
}}}
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/Makefile.win?rev=357224&r1=357223&r2=357224&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 16 12:38:12 2005
@@ -216,6 +216,7 @@
$(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_anon.mak CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -235,6 +236,9 @@
$(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+ cd modules\database
+ $(MAKE) $(MAKEOPT) -f mod_dbd.mak CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
cd modules\dav\main
$(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
@@ -382,6 +386,7 @@
copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_anon.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_default.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y
@@ -396,6 +401,7 @@
copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_mem_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_disk_cache.$(src_so) "$(inst_so)" <.y
+ copy modules\database\$(LONG)\mod_dbd.$(src_so) "$(inst_so)" <.y
copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so) "$(inst_so)" <.y
copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=357224&r1=357223&r2=357224&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 16 12:38:12 2005
@@ -76,9 +76,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * Backport Win32 build fixes for mod_dbd and mod_authn_dbd
- http://people.apache.org/~colm/httpd-2.2.0-dbd-win32.patch
- +1: colm, pquerna, niq
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Added: httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp?rev=357224&view=auto
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp (added)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp Fri Dec 16 12:38:12 2005
@@ -0,0 +1,132 @@
+# Microsoft Developer Studio Project File - Name="mod_authn_dbd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_authn_dbd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_authn_dbd.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_authn_dbd.mak" CFG="mod_authn_dbd - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_authn_dbd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_authn_dbd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_authn_dbd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I ../database /D DBD_DECLARE_EXPORT /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authn_dbd_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_authn_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbd.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_authn_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbd.so /opt:ref
+
+!ELSEIF "$(CFG)" == "mod_authn_dbd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I ../database /D DBD_DECLARE_EXPORT /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authn_dbd_src" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_authn_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbd.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_authn_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbd.so
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_authn_dbd - Win32 Release"
+# Name "mod_authn_dbd - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\database\mod_dbd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_authn_dbd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_authn_dbd.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_authn_dbd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_authn_dbd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_authn_dbd.so "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_dbd.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_authn_dbd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_authn_dbd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_authn_dbd.so "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_dbd.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
Propchange: httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c?rev=357224&r1=357223&r2=357224&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c Fri Dec 16 12:38:12 2005
@@ -119,7 +119,7 @@
}
return NULL;
}
-AP_DECLARE(void) ap_dbd_prepare(server_rec *s, const char *query,
+DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query,
const char *label)
{
svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
@@ -300,7 +300,7 @@
- open acquires a connection from the pool (opens one if necessary)
- close releases it back in to the pool
*/
-AP_DECLARE(void) ap_dbd_close(server_rec *s, ap_dbd_t *sql)
+DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec *s, ap_dbd_t *sql)
{
svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
if (!svr->persist) {
@@ -319,7 +319,7 @@
}
#define arec ((ap_dbd_t*)rec)
#if APR_HAS_THREADS
-AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
{
void *rec = NULL;
svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
@@ -356,7 +356,7 @@
return arec;
}
#else
-AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
{
apr_status_t rv = APR_SUCCESS;
const char *errmsg;
@@ -405,7 +405,7 @@
apr_reslist_release(req->dbpool, req->conn);
return APR_SUCCESS;
}
-AP_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
{
svr_cfg *svr;
dbd_pool_rec *req = ap_get_module_config(r->request_config, &dbd_module);
@@ -428,7 +428,7 @@
}
return req->conn;
}
-AP_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
{
svr_cfg *svr;
dbd_pool_rec *req = ap_get_module_config(c->conn_config, &dbd_module);
@@ -452,7 +452,7 @@
return req->conn;
}
#else
-AP_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
{
svr_cfg *svr;
ap_dbd_t *ret = ap_get_module_config(r->request_config, &dbd_module);
@@ -470,7 +470,7 @@
}
return ret;
}
-AP_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
{
svr_cfg *svr;
ap_dbd_t *ret = ap_get_module_config(c->conn_config, &dbd_module);
Added: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp?rev=357224&view=auto
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp (added)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp Fri Dec 16 12:38:12 2005
@@ -0,0 +1,132 @@
+# Microsoft Developer Studio Project File - Name="mod_dbd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_dbd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_dbd.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_dbd.mak" CFG="mod_dbd - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_dbd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_dbd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_dbd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DBD_DECLARE_EXPORT" /Fd"Release\mod_dbd_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_dbd.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_dbd.so /opt:ref
+
+!ELSEIF "$(CFG)" == "mod_dbd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DBD_DECLARE_EXPORT" /Fd"Debug\mod_dbd_src" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_dbd.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_dbd.so" /base:@..\..\os\win32\BaseAddr.ref,mod_dbd.so
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_dbd - Win32 Release"
+# Name "mod_dbd - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_dbd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_dbd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_dbd.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_dbd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_dbd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_dbd.so "dbd_module for Apache" ../../include/ap_release.h > .\mod_dbd.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_dbd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_dbd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_dbd.so "dbd_module for Apache" ../../include/ap_release.h > .\mod_dbd.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
Propchange: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h?rev=357224&r1=357223&r2=357224&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h Fri Dec 16 12:38:12 2005
@@ -32,6 +32,27 @@
#ifndef DBD_H
#define DBD_H
+/* Create a set of DBD_DECLARE(type), DBD_DECLARE_NONSTD(type) and
+ * DBD_DECLARE_DATA with appropriate export and import tags for the platform
+ */
+#if !defined(WIN32)
+#define DBD_DECLARE(type) type
+#define DBD_DECLARE_NONSTD(type) type
+#define DBD_DECLARE_DATA
+#elif defined(DBD_DECLARE_STATIC)
+#define DBD_DECLARE(type) type __stdcall
+#define DBD_DECLARE_NONSTD(type) type
+#define DBD_DECLARE_DATA
+#elif defined(DBD_DECLARE_EXPORT)
+#define DBD_DECLARE(type) __declspec(dllexport) type __stdcall
+#define DBD_DECLARE_NONSTD(type) __declspec(dllexport) type
+#define DBD_DECLARE_DATA __declspec(dllexport)
+#else
+#define DBD_DECLARE(type) __declspec(dllimport) type __stdcall
+#define DBD_DECLARE_NONSTD(type) __declspec(dllimport) type
+#define DBD_DECLARE_DATA __declspec(dllimport)
+#endif
+
#include <httpd.h>
#include <apr_optional.h>
#include <apr_hash.h>
@@ -47,28 +68,28 @@
/* acquire a connection that MUST be explicitly closed.
* Returns NULL on error
*/
-AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
/* release a connection acquired with ap_dbd_open */
-AP_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
+DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec*, ap_dbd_t*);
/* acquire a connection that will have the lifetime of a request
* and MUST NOT be explicitly closed. Return NULL on error.
* This is the preferred function for most applications.
*/
-AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_acquire(request_rec*);
/* acquire a connection that will have the lifetime of a connection
* and MUST NOT be explicitly closed. Return NULL on error.
* This is the preferred function for most applications.
*/
-AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
/* Prepare a statement for use by a client module during
* the server startup/configuration phase. Can't be called
* after the server has created its children (use apr_dbd_*).
*/
-AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
+DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec*, const char*, const char*);
/* Also export them as optional functions for modules that prefer it */
APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));