SF.net SVN: geany:[2992] trunk

[ntrel at users.sourceforge.net]

Revision: 2992
          http://geany.svn.sourceforge.net/geany/?rev=2992&view=rev
Author:   ntrel
Date:     2008-09-25 10:30:46 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Hopefully fix building when HAVE_REGCOMP is not defined.
Add debug message when trying to parse an error regex when
HAVE_REGCOMP is undefined.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-24 12:07:22 UTC (rev 2991)
+++ trunk/ChangeLog	2008-09-25 10:30:46 UTC (rev 2992)
@@ -1,3 +1,11 @@
+2008-09-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/filetypes.c:
+   Hopefully fix building when HAVE_REGCOMP is not defined.
+   Add debug message when trying to parse an error regex when
+   HAVE_REGCOMP is undefined.
+
+
 2008-09-24  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/main.h, src/about.c, src/main.c, src/socket.c:

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2008-09-24 12:07:22 UTC (rev 2991)
+++ trunk/src/filetypes.c	2008-09-25 10:30:46 UTC (rev 2992)
@@ -55,8 +55,10 @@
 {
 	GtkWidget	*menu_item;			/* holds a pointer to the menu item for this filetype */
 	gboolean	keyfile_loaded;
+#ifdef HAVE_REGCOMP
 	regex_t		error_regex;
 	gboolean	error_regex_compiled;
+#endif
 }
 GeanyFiletypePrivate;
 
@@ -852,11 +854,13 @@
 {
 	setptr(ft->error_regex_string, string);
 
+#ifdef HAVE_REGCOMP
 	if (ft->priv->error_regex_compiled)
 		regfree(&ft->priv->error_regex);
 
 	ft->priv->error_regex_compiled = FALSE;
 	/* regex will be compiled when needed */
+#endif
 }
 
 
@@ -1208,6 +1212,8 @@
 		gchar **filename, gint *line)
 {
 #ifndef HAVE_REGCOMP
+	if (!NZV(ft->error_regex_string))
+		geany_debug("No regex support - maybe you should configure with --enable-gnu-regex!");
 	return FALSE;
 #else
 	regex_t *regex = &ft->priv->error_regex;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.