Revision: 526
http://vcs.pcre.org/viewvc?view=rev&revision=526
Author: ph10
Date: 2010-05-26 11:54:18 +0100 (Wed, 26 May 2010)
Log Message:
-----------
Forgot to mention pcrecpp.h in previous fix.
Modified Paths:
--------------
code/trunk/NON-UNIX-USE
code/trunk/doc/pcreapi.3
Modified: code/trunk/NON-UNIX-USE
===================================================================
--- code/trunk/NON-UNIX-USE 2010-05-26 10:50:24 UTC (rev 525)
+++ code/trunk/NON-UNIX-USE 2010-05-26 10:54:18 UTC (rev 526)
@@ -188,9 +188,9 @@
LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
If you want to statically link a program against a PCRE library in the form of
-a non-dll .a file, you must define PCRE_STATIC before including pcre.h,
-otherwise the pcre_malloc() and pcre_free() exported functions will be declared
-__declspec(dllimport), with unwanted results.
+a non-dll .a file, you must define PCRE_STATIC before including pcre.h or
+pcrecpp.h, otherwise the pcre_malloc() and pcre_free() exported functions will
+be declared __declspec(dllimport), with unwanted results.
CALLING CONVENTIONS IN WINDOWS ENVIRONMENTS
@@ -497,5 +497,5 @@
=========================
-Last Updated: 19 January 2010
+Last Updated: 26 May 2010
****
Modified: code/trunk/doc/pcreapi.3
===================================================================
--- code/trunk/doc/pcreapi.3 2010-05-26 10:50:24 UTC (rev 525)
+++ code/trunk/doc/pcreapi.3 2010-05-26 10:54:18 UTC (rev 526)
@@ -134,8 +134,8 @@
.P
In a Windows environment, if you want to statically link an application program
against a non-dll \fBpcre.a\fP file, you must define PCRE_STATIC before
-including \fBpcre.h\fP, because otherwise the \fBpcre_malloc()\fP and
-\fBpcre_free()\fP exported functions will be declared
+including \fBpcre.h\fP or \fBpcrecpp.h\fP, because otherwise the
+\fBpcre_malloc()\fP and \fBpcre_free()\fP exported functions will be declared
\fB__declspec(dllimport)\fP, with unwanted results.
.P
The functions \fBpcre_compile()\fP, \fBpcre_compile2()\fP, \fBpcre_study()\fP,
