SF.net SVN: geany: [632] trunk

[eht16 at users.sourceforge.net]

Revision: 632
Author:   eht16
Date:     2006-07-25 11:09:08 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=632&view=rev

Log Message:
-----------
Applied patch to fix building with gcc 2.95, removed unneeded file from EXTRA_DIST.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/tagmanager/get.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-25 17:45:34 UTC (rev 631)
+++ trunk/ChangeLog	2006-07-25 18:09:08 UTC (rev 632)
@@ -12,6 +12,12 @@
  * src/callbacks.c:
    Fixed broken Find usage.
    Put "No matches" message also in the message window.
+ * Makefile.am, geany_windres.rc, configure.in, src/Makefile.am,
+   scintilla/Makefile.am, src/callbacks.c, tagmanager/tm_work_object.c,
+   tagmanager/ctags.c, tagmanager/get.c:
+   Small changes to get cross compiling using mingw32 suite working.
+ * tagmanager/get.c: Applied patch to fix building with gcc 2.95
+                     (closes #1528516, thanks).
 
 
 2006-07-24  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-07-25 17:45:34 UTC (rev 631)
+++ trunk/Makefile.am	2006-07-25 18:09:08 UTC (rev 632)
@@ -8,7 +8,6 @@
 	geany.spec \
 	geany.glade \
 	geany_windres.rc \
-	geany_windres.h \
 	geany.gladep \
 	data/global.tags \
 	data/php.tags \

Modified: trunk/tagmanager/get.c
===================================================================
--- trunk/tagmanager/get.c	2006-07-25 17:45:34 UTC (rev 631)
+++ trunk/tagmanager/get.c	2006-07-25 18:09:08 UTC (rev 632)
@@ -331,12 +331,9 @@
 
 static boolean directiveIf (const int c)
 {
-    DebugStatement ( const boolean ignore0 = isIgnore (); )
     const boolean ignore = pushConditional ((boolean) (c != '0'));
 
     Cpp.directive.state = DRCTV_NONE;
-    DebugStatement ( debugCppNest (TRUE, Cpp.directive.nestLevel);
-		    if (ignore != ignore0) debugCppIgnore (ignore); )
 
     return ignore;
 }


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