SF.net SVN: geany: [2682] trunk

[eht16 at users.sourceforge.net]

Revision: 2682
          http://geany.svn.sourceforge.net/geany/?rev=2682&view=rev
Author:   eht16
Date:     2008-06-11 10:30:04 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
Updated generated marshal code for Scintilla.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/scintilla-marshal.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-11 17:03:01 UTC (rev 2681)
+++ trunk/ChangeLog	2008-06-11 17:30:04 UTC (rev 2682)
@@ -7,6 +7,8 @@
  * scripts/wafinit.sh:
    Create Makefiles for src, tagmanager and scintilla sub directories
    to be able to run make from within Geany.
+ * scintilla/scintilla-marshal.c:
+   Updated generated marschal code for Scintilla.
 
 
 2008-06-10  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/scintilla/scintilla-marshal.c
===================================================================
--- trunk/scintilla/scintilla-marshal.c	2008-06-11 17:03:01 UTC (rev 2681)
+++ trunk/scintilla/scintilla-marshal.c	2008-06-11 17:30:04 UTC (rev 2682)
@@ -35,8 +35,8 @@
 #define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
 #define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
 #define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
 #define g_marshal_value_peek_float(v)    (v)->data[0].v_float
 #define g_marshal_value_peek_double(v)   (v)->data[0].v_double
 #define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
@@ -50,10 +50,10 @@
 /* NONE:INT,POINTER (scintilla-marshal.list:1) */
 void
 scintilla_marshal_VOID__INT_POINTER (GClosure     *closure,
-                                     GValue       *return_value,
+                                     GValue       *return_value G_GNUC_UNUSED,
                                      guint         n_param_values,
                                      const GValue *param_values,
-                                     gpointer      invocation_hint,
+                                     gpointer      invocation_hint G_GNUC_UNUSED,
                                      gpointer      marshal_data)
 {
   typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer     data1,


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