--- a/ExternalLibraryFunction.st	Thu Nov 05 20:29:45 2009 +0100
+++ b/ExternalLibraryFunction.st	Thu Nov 05 23:14:40 2009 +0100
@@ -585,9 +585,9 @@
 
 ffiTypeSymbolForType:aType
     "map type to one of the ffi-supported ones:
-	sint8, sint16, sint32, sint64
-	uint8, uint16, uint32, uint64
-	bool void pointer handle
+        sint8, sint16, sint32, sint64
+        uint8, uint16, uint32, uint64
+        bool void pointer handle
     "
 
     aType == #sint8           ifTrue:[^ aType ].
@@ -629,7 +629,9 @@
     aType == #sdword          ifTrue:[^ #sint32 ].
     aType == #word            ifTrue:[^ #uint16 ].
     aType == #sword           ifTrue:[^ #sint16 ].
+    aType == #longlong        ifTrue:[^ #sint64 ].
     aType == #longLong        ifTrue:[^ #sint64 ].
+    aType == #ulonglong       ifTrue:[^ #uint64 ].
     aType == #ulongLong       ifTrue:[^ #uint64 ].
     aType == #handle          ifTrue:[^ #pointer ].
     aType == #lpstr           ifTrue:[^ #charPointer ].
@@ -643,14 +645,14 @@
     aType == #unsigned        ifTrue:[^ #uint ].
 
     (aType isString or:[aType isSymbol]) ifFalse:[
-	CType isNil ifTrue:[
-	    self error:'unknown type'.
-	].
-	^ aType typeSymbol.
+        CType isNil ifTrue:[
+            self error:'unknown type'.
+        ].
+        ^ aType typeSymbol.
     ].
 
     (aType endsWith:'Pointer') ifTrue:[
-	^ #pointer.
+        ^ #pointer.
     ].
     ^ aType
 
@@ -1398,11 +1400,11 @@
 !ExternalLibraryFunction class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.71 2009-11-05 16:25:16 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.72 2009-11-05 22:14:40 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.71 2009-11-05 16:25:16 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.72 2009-11-05 22:14:40 cg Exp $'
 ! !
 
 ExternalLibraryFunction initialize!