httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r651399 - in /httpd/apreq/branches/v2_10: CHANGES include/apreq.h libapreq.rc win32/apreq2_test.mak win32/libapreq2.mak
Date Thu, 24 Apr 2008 20:29:01 GMT
Author: pgollucci
Date: Thu Apr 24 13:28:55 2008
New Revision: 651399

URL: http://svn.apache.org/viewvc?rev=651399&view=rev
Log:
backports: 651366, 651374, 651381, 651385, 651388



Added:
    httpd/apreq/branches/v2_10/libapreq.rc
      - copied unchanged from r651388, httpd/apreq/trunk/libapreq.rc
Modified:
    httpd/apreq/branches/v2_10/CHANGES
    httpd/apreq/branches/v2_10/include/apreq.h
    httpd/apreq/branches/v2_10/win32/apreq2_test.mak
    httpd/apreq/branches/v2_10/win32/libapreq2.mak

Modified: httpd/apreq/branches/v2_10/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/CHANGES?rev=651399&r1=651398&r2=651399&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/CHANGES (original)
+++ httpd/apreq/branches/v2_10/CHANGES Thu Apr 24 13:28:55 2008
@@ -4,6 +4,14 @@
 
 @section v2_10 Changes with libapreq2-2.10 (under developement)
 
+- License [Mladen Turk]
+  Add libapreq.rc and generate libapreq.res
+
+- 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
@@ -16,7 +24,7 @@
      flag |= APR_FILE_NOCLEANUP | APR_SHARELOCK;
   in apreq_file_cleanup, to avoid problems with file uploads.
 
-@section v2_09 Changes with libapreq2-2.09 ()
+@section v2_09 Changes with libapreq2-2.09 ( not released)
 
 - C API [joes]
   Fix leak associated to calling apreq_brigade_fwrite() on an upload

Modified: httpd/apreq/branches/v2_10/include/apreq.h
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/include/apreq.h?rev=651399&r1=651398&r2=651399&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/include/apreq.h (original)
+++ httpd/apreq/branches/v2_10/include/apreq.h Thu Apr 24 13:28:55 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/branches/v2_10/win32/apreq2_test.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/win32/apreq2_test.mak?rev=651399&r1=651398&r2=651399&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/win32/apreq2_test.mak (original)
+++ httpd/apreq/branches/v2_10/win32/apreq2_test.mak Thu Apr 24 13:28:55 2008
@@ -127,7 +127,7 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"/YX
/I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /FD /GZ  /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX
/I"$(APACHE)\include" /I"$(APREQ_HOME)\include" /FD /GZ  /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(LIBDIR)\apreq2_test.bsc" 
 LIB32=link.exe -lib

Modified: httpd/apreq/branches/v2_10/win32/libapreq2.mak
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/win32/libapreq2.mak?rev=651399&r1=651398&r2=651399&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/win32/libapreq2.mak (original)
+++ httpd/apreq/branches/v2_10/win32/libapreq2.mak Thu Apr 24 13:28:55 2008
@@ -62,12 +62,13 @@
 	"$(INTDIR)\parser_header.obj" \
 	"$(INTDIR)\parser_multipart.obj" \
 	"$(INTDIR)\parser_urlencoded.obj" \
-        "$(INTDIR)\util.obj" \
-        "$(INTDIR)\version.obj" \
-        "$(INTDIR)\module.obj" \
-        "$(INTDIR)\module_custom.obj" \
-        "$(INTDIR)\module_cgi.obj" \
-        "$(INTDIR)\error.obj" \
+	"$(INTDIR)\util.obj" \
+	"$(INTDIR)\version.obj" \
+	"$(INTDIR)\module.obj" \
+	"$(INTDIR)\module_custom.obj" \
+	"$(INTDIR)\module_cgi.obj" \
+	"$(INTDIR)\error.obj" \
+	"$(INTDIR)\libprocrun.res \
 	"$(APR_LIB)" \
 	"$(APU_LIB)"
 
@@ -78,8 +79,10 @@
 "$(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 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "NDEBUG" /i "$(APREQ_HOME)\include"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
@@ -99,8 +102,10 @@
 "$(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 
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "_DEBUG /i "$(APREQ_HOME)\include"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc" 
 LINK32=link.exe
@@ -207,6 +212,11 @@
 
 "$(INTDIR)\error.obj" : $(SOURCE) "$(INTDIR)"
         $(CPP) /Fo"$(INTDIR)\error.obj" $(CPP_PROJ) $(SOURCE)
+
+SOURCE=.\libapreq.rc
+
+"$(INTDIR)\libapreq.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /fo"$(INTDIR)\libapreq.res" $(RSC_PROJ) $(SOURCE)
 
 !ENDIF 
 



Mime
View raw message