SF.net SVN: geany: [2671] trunk

[eht16 at users.sourceforge.net]

Revision: 2671
          http://geany.svn.sourceforge.net/geany/?rev=2671&view=rev
Author:   eht16
Date:     2008-06-09 10:29:25 -0700 (Mon, 09 Jun 2008)

Log Message:
-----------
Compile Scintilla without threading support to fix freezes with GLib >= 2.16 on Windows.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/makefile.win32

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-09 17:17:38 UTC (rev 2670)
+++ trunk/ChangeLog	2008-06-09 17:29:25 UTC (rev 2671)
@@ -1,3 +1,10 @@
+2008-06-09  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * scintilla/makefile.win32:
+   Compile Scintilla without threading support to fix freezes with
+   GLib >= 2.16 on Windows.
+
+
 2008-06-09  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * tagmanager/python.c:

Modified: trunk/scintilla/makefile.win32
===================================================================
--- trunk/scintilla/makefile.win32	2008-06-09 17:17:38 UTC (rev 2670)
+++ trunk/scintilla/makefile.win32	2008-06-09 17:29:25 UTC (rev 2671)
@@ -37,10 +37,10 @@
 INCLUDEDIRS=-I include -I . $(GTK_INCLUDES)
 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DGTK2 -DSCI_LEXER $(INCLUDEDIRS) -mms-bitfields
 
-ifdef NOTHREADS
+ifdef THREADS
+THREADFLAGS=
+else
 THREADFLAGS=-DG_THREADS_IMPL_NONE
-else
-THREADFLAGS=
 endif
 
 ifdef DEBUG


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