Remove check for winsock.h since it might show up on Linux+Wine. Instead

[~andy/gtk] / gtk / gtkmarshalers.list

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 909da41df54b8228b382430ac3a4ea1d5173480c..b0fa87862df399bfa6fc346e0ef02ca2db60934c 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -22,33 +22,42 @@
 #   BOOL        deprecated alias for BOOLEAN
 
 BOOLEAN:BOXED
+BOOLEAN:BOXED,BOXED
+BOOLEAN:ENUM
+BOOLEAN:ENUM,INT
+BOOLEAN:OBJECT,UINT,FLAGS
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
+BOOLEAN:INT,INT
 BOOLEAN:VOID
 BOOLEAN:BOOLEAN
 ENUM:ENUM
 INT:POINTER
-NONE:BOOL
+NONE:BOOLEAN
+NONE:ENUM
 NONE:INT
+NONE:INT,BOOL
 NONE:INT,INT
 NONE:NONE
-NONE:POINTER
 NONE:STRING,INT,POINTER
+STRING:DOUBLE
+VOID:DOUBLE
 VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED,BOXED
 VOID:BOXED,BOXED,POINTER
-VOID:BOXED,POINTER
 VOID:BOXED,OBJECT
 VOID:BOXED,STRING,INT
 VOID:BOXED,UINT
 VOID:BOXED,UINT,FLAGS
 VOID:BOXED,UINT,UINT
 VOID:ENUM
+VOID:ENUM,BOOLEAN
+VOID:ENUM,ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,FLOAT,BOOLEAN
 VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
@@ -64,12 +73,17 @@ VOID:OBJECT,INT,INT,BOXED,UINT,UINT
 VOID:OBJECT,OBJECT
 VOID:OBJECT,STRING,STRING
 VOID:OBJECT,UINT
+VOID:OBJECT,UINT,FLAGS
 VOID:POINTER
 VOID:POINTER,INT
 VOID:POINTER,POINTER,POINTER
 VOID:POINTER,UINT
 VOID:STRING
+VOID:STRING,STRING
 VOID:STRING,INT,POINTER
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,FLAGS,BOXED
+VOID:UINT,UINT
 VOID:UINT,STRING
+VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
 VOID:VOID