httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r651381 - in /httpd/apreq/trunk: CHANGES include/apreq.h win32/libapreq2.mak
Date Thu, 24 Apr 2008 20:12:12 GMT
Author: pgollucci
Date: Thu Apr 24 13:12:05 2008
New Revision: 651381

URL: http://svn.apache.org/viewvc?rev=651381&view=rev
Log:
Add APREQ_DECLARE_EXPORT/APREQ_DECLARE_STATIC
in the same way as APR declares so that dllexport/dllimport
get correctly handled.   

Reviewed by: wrowe
Submitted by: Mladen Turk <mturk@apache.org>


Modified:
    httpd/apreq/trunk/CHANGES
    httpd/apreq/trunk/include/apreq.h
    httpd/apreq/trunk/win32/libapreq2.mak

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=651381&r1=651380&r2=651381&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Thu Apr 24 13:12:05 2008
@@ -4,6 +4,11 @@
 
 @section v2_10 Changes with libapreq2-2.10 (under developement)
 
+- Build [Mladen Turk]
+  Add APREQ_DECLARE_EXPORT/APREQ_DECLARE_STATIC
+  in the same way as APR declares so that dllexport/dllimport
+  get correctly handled.   
+
 - Build [Randy Kobes]
   Add appropriate manifest command to embed manifest files on Win32 
   when using VC8

Modified: httpd/apreq/trunk/include/apreq.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/include/apreq.h?rev=651381&r1=651380&r2=651381&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq.h (original)
+++ httpd/apreq/trunk/include/apreq.h Thu Apr 24 13:12:05 2008
@@ -69,10 +69,18 @@
  * APREQ_DECLARE_DATA type apr_variable = value;
  */
 #define APREQ_DECLARE_DATA
-#else
+#elif defined (APREQ_DECLARE_STATIC)
+#define APREQ_DECLARE(type)             type __stdcall
+#define APREQ_DECLARE_NONSTD(type)      type
+#define APREQ_DECLARE_DATA
+#elif defined (APREQ_DECLARE_EXPORT)
 #define APREQ_DECLARE(type)             __declspec(dllexport) type __stdcall
 #define APREQ_DECLARE_NONSTD(type)      __declspec(dllexport) type
 #define APREQ_DECLARE_DATA              __declspec(dllexport)
+#else
+#define APREQ_DECLARE(type)             __declspec(dllimport) type __stdcall
+#define APREQ_DECLARE_NONSTD(type)      __declspec(dllimport) type
+#define APREQ_DECLARE_DATA              __declspec(dllimport)
 #endif
 
 /**

Modified: httpd/apreq/trunk/win32/libapreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/libapreq2.mak?rev=651381&r1=651380&r2=651381&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/libapreq2.mak (original)
+++ httpd/apreq/trunk/win32/libapreq2.mak Thu Apr 24 13:12:05 2008
@@ -78,7 +78,7 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /YX /FD /c 
+CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "APREQ_DECLARE_EXPORT" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /YX /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
@@ -99,7 +99,7 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /YX /FD /GZ  /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "APREQ_DECLARE_EXPORT" /I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /YX
/FD /GZ  /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 



Mime
View raw message