SF.net SVN: geany:[3774] trunk

[eht16 at users.sourceforge.net]

Revision: 3774
          http://geany.svn.sourceforge.net/geany/?rev=3774&view=rev
Author:   eht16
Date:     2009-05-08 17:04:40 +0000 (Fri, 08 May 2009)

Log Message:
-----------
Backport change from Scintilla CVS:
Change capitalisation of header file to suit cross-compilation on Unix for Windows.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/include/Scintilla.h
    trunk/scintilla/scintilla_changes.patch

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-08 17:00:28 UTC (rev 3773)
+++ trunk/ChangeLog	2009-05-08 17:04:40 UTC (rev 3774)
@@ -6,6 +6,10 @@
    itself is also UTF-8.
  * src/utils.c, src/utils.h, src/highlighting.c, src/printing.c:
    Add utils_color_invert() and use it in highlighting.c and printing.c.
+ * scintilla/include/Scintilla.h, scintilla/scintilla_changes.patch:
+   Backport change from Scintilla CVS:
+   Change capitalisation of header file to suit cross-compilation on
+   Unix for Windows.
 
 
 2009-05-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/scintilla/include/Scintilla.h
===================================================================
--- trunk/scintilla/include/Scintilla.h	2009-05-08 17:00:28 UTC (rev 3773)
+++ trunk/scintilla/include/Scintilla.h	2009-05-08 17:04:40 UTC (rev 3774)
@@ -26,7 +26,7 @@
  * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
  * May need to be changed for 64 bit platforms. */
 #if defined(_WIN32)
-#include <BaseTsd.h>
+#include <basetsd.h>
 #endif
 #ifdef MAXULONG_PTR
 typedef ULONG_PTR uptr_t;

Modified: trunk/scintilla/scintilla_changes.patch
===================================================================
--- trunk/scintilla/scintilla_changes.patch	2009-05-08 17:00:28 UTC (rev 3773)
+++ trunk/scintilla/scintilla_changes.patch	2009-05-08 17:04:40 UTC (rev 3774)
@@ -151,6 +151,15 @@
 diff -Naurp /tmp/scintilla/include/Scintilla.h scintilla/include/Scintilla.h
 --- /tmp/scintilla/include/Scintilla.h	2009-04-25 02:06:02.000000000 +0200
 +++ scintilla/include/Scintilla.h	2009-05-01 11:51:07.000000000 +0200
+@@ -26,7 +26,7 @@ int Scintilla_LinkLexers();
+  * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
+  * May need to be changed for 64 bit platforms. */
+ #if defined(_WIN32)
+-#include <BaseTsd.h>
++#include <basetsd.h>
+ #endif
+ #ifdef MAXULONG_PTR
+ typedef ULONG_PTR uptr_t;
 @@ -845,7 +845,7 @@ struct SCNotification {
  	int ch;		/* SCN_CHARADDED, SCN_KEY */
  	int modifiers;	/* SCN_KEY */


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