Changed <> to "" to help inclusion; added regex files to VC++ project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/regex/debug.c b/src/regex/debug.c
index 99ce7da6dda0768ca3da54521e030aaf17b44b1e..bf40bbb3bd4722038226c7dd1148b1b6efabe261 100644 (file)
--- a/src/regex/debug.c
+++ b/src/regex/debug.c
@@ -4,7 +4,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <regex.h>
+#include "regex.h"
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 8733e373f4713abb32fad017cf2f3b1be8440d4f..bb44525ba4bad5bad6b0b1694d6eb5fca34ebc6c 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <regex.h>
+#include "regex.h"
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/regex/regerror.c b/src/regex/regerror.c
index 1ec073997d5515779a1a746fe2369876975023d7..1bb1ec1ce842d5cb19e2657ad737359956586589 100644 (file)
--- a/src/regex/regerror.c
+++ b/src/regex/regerror.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <regex.h>
+#include "regex.h"
 
 #include "utils.h"
 #include "regerror.ih"

diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index a1037648e793e59c47ee1c408bcc0273006c9304..7e314950e7501cf7f88904aeb7e0368ec7d47d1e 100644 (file)
--- a/src/regex/regexec.c
+++ b/src/regex/regexec.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#include <regex.h>
+#include "regex.h"
 
 #include "utils.h"
 #include "regex2.h"

diff --git a/src/regex/regfree.c b/src/regex/regfree.c
index 17a73896f55701c03ce11694ef96b39deaad098b..9c1488ab23a319ebe78c5e22eb4412a01fc525e7 100644 (file)
--- a/src/regex/regfree.c
+++ b/src/regex/regfree.c
@@ -1,53 +1,37 @@
-/*
- * regfree - free an RE
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * You might think that this could be incorporated into regcomp.c, and
- * that would be a reasonable idea... except that this is a generic
- * function (with a generic name), applicable to all compiled REs
- * regardless of the size of their characters, whereas the stuff in
- * regcomp.c gets compiled once per character size.
- */
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "regex.h"
 
-#include "regguts.h"
+#include "utils.h"
+#include "regex2.h"
 
 /*
- - regfree - free an RE (generic function, punts to RE-specific function)
- *
- * Ignoring invocation with NULL is a convenience.
+ - regfree - free everything
+ = extern void regfree(regex_t *);
  */
-VOID
-regfree(re)
-regex_t *re;
+void
+regfree(preg)
+regex_t *preg;
 {
-       if (re == NULL)
+       register struct re_guts *g;
+
+       if (preg->re_magic != MAGIC1)   /* oops */
+               return;                 /* nice to complain, but hard */
+
+       g = preg->re_g;
+       if (g == NULL || g->magic != MAGIC2)    /* oops again */
                return;
-       (*((struct fns *)re->re_fns)->free)(re);
+       preg->re_magic = 0;             /* mark it invalid */
+       g->magic = 0;                   /* mark it invalid */
+
+       if (g->strip != NULL)
+               free((char *)g->strip);
+       if (g->sets != NULL)
+               free((char *)g->sets);
+       if (g->setbits != NULL)
+               free((char *)g->setbits);
+       if (g->must != NULL)
+               free(g->must);
+       free((char *)g);
 }

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 2ea191af4777fc66aa8812e2ba813950b155e8dd..86a24d799a5fdf62fd959c317c3b39a39704b536 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -412,6 +412,10 @@ SOURCE=.\common\radiocmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\regex.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\resource.cpp
 # End Source File
 # Begin Source File
@@ -1214,5 +1218,34 @@ SOURCE=.\msw\ole\uuid.cpp
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group
+# Begin Group "Regex Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\regex\regcomp.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regerror.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regexec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regfree.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\split.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group
 # End Target
 # End Project

diff --git a/src/wxvc.dsw b/src/wxvc.dsw
index 8d4bf0a1d109620b39fc9a6ff0f5abe19f0c773a..4aaa206b10181b41c9e2b41dd98a80dd2c90615e 100644 (file)
--- a/src/wxvc.dsw
+++ b/src/wxvc.dsw
@@ -7,6 +7,8 @@ Project: "jpeg"=.\jpeg\JpegVC.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
+    JpegVC
+    .\jpeg
 }}}
 
 Package=<4>
@@ -19,6 +21,8 @@ Project: "png"=.\png\PngVC.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
+    PngVC
+    .\png
 }}}
 
 Package=<4>
@@ -31,6 +35,8 @@ Project: "tiff"=.\tiff\TiffVC.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
+    TiffVC
+    .\tiff
 }}}
 
 Package=<4>
@@ -43,6 +49,8 @@ Project: "wxvc"=.\wxvc.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
+    wxvc
+    ..
 }}}
 
 Package=<4>
@@ -67,6 +75,8 @@ Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
+    ZlibVC
+    .\zlib
 }}}
 
 Package=<4>

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 99b716ffa8c4f48a77206e3584bc847abbebfa5f..b45258f9c12e859c1d021365eb0738ebc21cad5b 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -2378,5 +2378,34 @@ SOURCE=.\tiff\tif_zip.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
+# Begin Group "Regex Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\regex\regcomp.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regerror.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regexec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\regfree.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\regex\split.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group
 # End Target
 # End Project