Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / marshaller-list

diff --git a/src/ui/gui/marshaller-list b/src/ui/gui/marshaller-list
index cb7c9113afe67df6cb514b702a2db820f5231603..5b6c0e5b586f1eb12a07b63946fa86023bc915d9 100644 (file)
--- a/src/ui/gui/marshaller-list
+++ b/src/ui/gui/marshaller-list
@@ -1,13 +1,15 @@
 #List of custom marshallers used by psppire
 
 BOOLEAN:BOOLEAN
+BOOLEAN:BOXED
 BOOLEAN:ENUM
-BOOLEAN:BOXED,POINTER
+BOOLEAN:ENUM,INT
+BOOLEAN:INT
+BOOLEAN:OBJECT
 BOOLEAN:VOID
-VOID:BOXED,BOXED
+VOID:BOXED,OBJECT
 VOID:INT,INT
-VOID:INT,LONG
-VOID:INT,INT,INT
-VOID:INT,INT,INT,INT
-VOID:INT,POINTER
 VOID:OBJECT,OBJECT
+VOID:POINTER,INT,INT
+VOID:INT,UINT,POINTER
+VOID:UINT,UINT,UINT