Revision: 37476
http://brlcad.svn.sourceforge.net/brlcad/?rev=37476&view=rev
Author: starseeker
Date: 2010-01-29 16:44:36 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Pull in regex.h changes from trunk.
Modified Paths:
--------------
brlcad/branches/dmtogl/src/other/tcl/generic/regex.h
Modified: brlcad/branches/dmtogl/src/other/tcl/generic/regex.h
===================================================================
--- brlcad/branches/dmtogl/src/other/tcl/generic/regex.h 2010-01-29
16:40:18 UTC (rev 37475)
+++ brlcad/branches/dmtogl/src/other/tcl/generic/regex.h 2010-01-29
16:44:36 UTC (rev 37476)
@@ -70,49 +70,15 @@
* Add your own defines, if needed, here.
*/
+#include "./tclInt.h"
+
/*
* Location where a chunk of regcustom.h is automatically spliced into this
* file (working from its prototype, regproto.h).
*/
/* --- begin --- */
-/* ensure certain things don't sneak in from system headers */
-#ifdef __REG_WIDE_T
-#undef __REG_WIDE_T
-#endif
-#ifdef __REG_WIDE_COMPILE
-#undef __REG_WIDE_COMPILE
-#endif
-#ifdef __REG_WIDE_EXEC
-#undef __REG_WIDE_EXEC
-#endif
-#ifdef __REG_REGOFF_T
-#undef __REG_REGOFF_T
-#endif
-#ifdef __REG_VOID_T
-#undef __REG_VOID_T
-#endif
-#ifdef __REG_CONST
-#undef __REG_CONST
-#endif
-#ifdef __REG_NOFRONT
-#undef __REG_NOFRONT
-#endif
-#ifdef __REG_NOCHAR
-#undef __REG_NOCHAR
-#endif
-/* interface types */
-#define __REG_WIDE_T Tcl_UniChar
-#define __REG_REGOFF_T long /* not really right, but good enough...
*/
-#define __REG_VOID_T void
-#define __REG_CONST const
-/* names and declarations */
-#define __REG_WIDE_COMPILE TclReComp
-#define __REG_WIDE_EXEC TclReExec
-#define __REG_NOFRONT /* don't want regcomp() and regexec() */
-#define __REG_NOCHAR /* or the char versions */
-#define regfree TclReFree
-#define regerror TclReError
+#define __REG_NOCHAR 1 /* don't define the char versions so we can avoid
conflicting type compilation errors */
/* --- end --- */
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
