python: windows compat

diff --git a/extra/python/ffi/ffi.factor b/extra/python/ffi/ffi.factor
index a7cd55d6b769941ccca38c74df04d4a8327ff5ed..9166f4c9f66a038788773a97d4810ce3068c6cc6 100644 (file)
--- a/extra/python/ffi/ffi.factor
+++ b/extra/python/ffi/ffi.factor
@@ -4,11 +4,15 @@ USING:
     alien.destructors
     alien.libraries alien.libraries.finder
     alien.syntax
+    assocs
     kernel
-    sequences ;
+    sequences
+    system ;
 IN: python.ffi
 
-<< "python" { "3.0" "2.6" "2.7" } [
+<< "python" {
+    { unix { "3.0" "2.6" "2.7" } } { windows { "26" "27" "30" } }
+} os of [
     "python" prepend find-library
 ] map-find drop cdecl add-library >>
 
@@ -66,7 +70,7 @@ FUNCTION: PyObject* PyObject_GetAttrString ( PyObject* callable,
 FUNCTION: PyObject* PyObject_Str ( PyObject* o ) ;
 
 ! Strings
-FUNCTION: c-string PyString_AsString ( PyObject* string ) ;
+FUNCTION: void* PyString_AsString ( PyObject* string ) ;
 FUNCTION: PyObject* PyString_FromString ( c-string v ) ;
 
 ! Unicode
@@ -74,6 +78,8 @@ FUNCTION: PyObject* PyUnicode_DecodeUTF8 ( c-string s,
                                            int size,
                                            void* errors ) ;
 FUNCTION: PyObject* PyUnicodeUCS4_FromString ( c-string s ) ;
+FUNCTION: PyObject* PyUnicodeUCS2_FromString ( c-string s ) ;
+FUNCTION: PyObject* PyUnicodeUCS2_AsUTF8String ( PyObject* unicode ) ;
 FUNCTION: PyObject* PyUnicodeUCS4_AsUTF8String ( PyObject* unicode ) ;
 
 ! Ints