Changeset 34

Show
Ignore:
Timestamp:
07/24/04 05:48:55 (4 years ago)
Author:
aldacron
Message:

* [DerelictPY] added unicodeobject.d
* [DerelictPY] uncommented the unicode stuff in intobject.d and added unicodeobject import
* [DerelictPY] updated the makefile

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/DerelictPY/Makefile

    r33 r34  
    1414    $(PY.SRC.DIR)\intobject.d \ 
    1515    $(PY.SRC.DIR)\object.d \ 
    16     $(PY.SRC.DIR)\python.d 
     16    $(PY.SRC.DIR)\python.d \ 
     17    $(PY.SRC.DIR)\unicodeobject.d 
    1718     
    1819PY.OBJ.DIR = $(OBJ.DIR)\python 
     
    2223    $(PY.OBJ.DIR)\intobject.obj \ 
    2324    $(PY.OBJ.DIR)\object.obj \ 
    24     $(PY.OBJ.DIR)\python.obj 
     25    $(PY.OBJ.DIR)\python.obj \ 
     26    $(PY.OBJ.DIR)\unicodeobject.obj 
    2527     
    2628PY.LIB = $(LIB.DIR)\derelictPY.lib 
  • trunk/DerelictPY/derelict/python/intobject.d

    r33 r34  
    22 
    33private import derelict.python.object; 
     4private import derelict.python.unicodeobject; 
    45 
    56//============================================================================== 
     
    2627 
    2728typedef PyObject* function(char*, char**, int) pfPyInt_FromString; 
    28 //typedef PyObject* function(Py_UNICODE*, char**, int) pfPyInt_FromUnicode; 
     29typedef PyObject* function(Py_UNICODE*, char**, int) pfPyInt_FromUnicode; 
    2930typedef PyObject* function(int) pfPyInt_FromLong; 
    3031typedef int function(PyObject*) pfPyInt_AsLong; 
     
    3536typedef int function(char*, char**, int) pfPyOS_strtol; 
    3637pfPyInt_FromString              PyInt_FromString; 
    37 //pfPyInt_FromUnicode             PyInt_FromUnicode; 
     38pfPyInt_FromUnicode               PyInt_FromUnicode; 
    3839pfPyInt_FromLong                PyInt_FromLong; 
    3940pfPyInt_AsLong                  PyInt_AsLong;