[Py2exe-checkins] py2exe/source mktab.py,1.1,1.2 import-tab.h,1.1,1.2 import-tab.c,1.1,1.2

[Thomas H. <th...@us...>]

Update of /cvsroot/py2exe/py2exe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101

Modified Files:
	mktab.py import-tab.h import-tab.c 
Log Message:
Add PyString_AsString.


Index: mktab.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/mktab.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mktab.py	21 Apr 2005 19:42:50 -0000	1.1
--- mktab.py	26 Apr 2005 14:30:46 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  PyObject *, PyObject_CallFunction, (PyObject *, char *, ...)
  int, PyString_AsStringAndSize, (PyObject *, char **, int *)
+ char *, PyString_AsString, (PyObject *)
  int, PyArg_ParseTuple, (PyObject *, char *, ...)
  PyObject *, PyErr_Format, (PyObject *, const char *, ...)

Index: import-tab.c
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/import-tab.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** import-tab.c	21 Apr 2005 19:43:34 -0000	1.1
--- import-tab.c	26 Apr 2005 14:30:48 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
  	{ "PyObject_CallFunction", NULL },
  	{ "PyString_AsStringAndSize", NULL },
+ 	{ "PyString_AsString", NULL },
  	{ "PyArg_ParseTuple", NULL },
  	{ "PyErr_Format", NULL },

Index: import-tab.h
===================================================================
RCS file: /cvsroot/py2exe/py2exe/source/import-tab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** import-tab.h	21 Apr 2005 19:43:34 -0000	1.1
--- import-tab.h	26 Apr 2005 14:30:48 -0000	1.2
***************
*** 8,49 ****
  #define PyObject_CallFunction ((PyObject *(*)(PyObject *, char *, ...))imports[7].proc)
  #define PyString_AsStringAndSize ((int(*)(PyObject *, char **, int *))imports[8].proc)
! #define PyArg_ParseTuple ((int(*)(PyObject *, char *, ...))imports[9].proc)
! #define PyErr_Format ((PyObject *(*)(PyObject *, const char *, ...))imports[10].proc)
! #define PyImport_ImportModule ((PyObject *(*)(char *))imports[11].proc)
! #define PyInt_FromLong ((PyObject *(*)(long))imports[12].proc)
! #define PyInt_AsLong ((long(*)(PyObject *))imports[13].proc)
! #define PyLong_FromVoidPtr ((PyObject *(*)(void *))imports[14].proc)
! #define Py_InitModule4 ((PyObject *(*)(char *, PyMethodDef *, char *, PyObject *, int))imports[15].proc)
! #define PyTuple_New ((PyObject *(*)(int))imports[16].proc)
! #define PyTuple_SetItem ((int(*)(PyObject*, int, PyObject *))imports[17].proc)
! #define Py_IsInitialized ((int(*)(void))imports[18].proc)
! #define PyObject_SetAttrString ((int(*)(PyObject *, char *, PyObject *))imports[19].proc)
! #define PyCFunction_NewEx ((PyObject *(*)(PyMethodDef *, PyObject *, PyObject *))imports[20].proc)
! #define PyObject_GetAttrString ((PyObject *(*)(PyObject *, char *))imports[21].proc)
! #define Py_BuildValue ((PyObject *(*)(char *, ...))imports[22].proc)
! #define PyObject_Call ((PyObject *(*)(PyObject *, PyObject *, PyObject *))imports[23].proc)
! #define PySys_WriteStderr ((void(*)(const char *, ...))imports[24].proc)
! #define PyErr_Occurred ((PyObject *(*)(void))imports[25].proc)
! #define PyErr_Clear ((void(*)(void))imports[26].proc)
! #define PyObject_IsInstance ((int(*)(PyObject *, PyObject *))imports[27].proc)
! #define PyInt_Type (*(PyObject(*))imports[28].proc)
! #define _Py_NoneStruct (*(PyObject(*))imports[29].proc)
! #define PyExc_ImportError (*(PyObject *(*))imports[30].proc)
! #define PyGILState_Ensure ((PyGILState_STATE(*)(void))imports[31].proc)
! #define PyGILState_Release ((void(*)(PyGILState_STATE))imports[32].proc)
! #define PySys_SetObject ((void(*)(char *, PyObject *))imports[33].proc)
! #define PySys_GetObject ((PyObject *(*)(char *))imports[34].proc)
! #define PyString_FromString ((PyObject *(*)(char *))imports[35].proc)
! #define Py_FdIsInteractive ((int(*)(FILE *, char *))imports[36].proc)
! #define PyRun_InteractiveLoop ((int(*)(FILE *, char *))imports[37].proc)
! #define PySys_SetArgv ((void(*)(int, char **))imports[38].proc)
! #define PyImport_AddModule ((PyObject *(*)(char *))imports[39].proc)
! #define PyModule_GetDict ((PyObject *(*)(PyObject *))imports[40].proc)
! #define PySequence_Length ((int(*)(PyObject *))imports[41].proc)
! #define PySequence_GetItem ((PyObject *(*)(PyObject *, int))imports[42].proc)
! #define PyEval_EvalCode ((PyObject *(*)(PyCodeObject *, PyObject *, PyObject *))imports[43].proc)
! #define PyErr_Print ((void(*)(void))imports[44].proc)
! #define PyBool_FromLong ((PyObject *(*)(long))imports[45].proc)
! #define Py_VerboseFlag (*(int(*))imports[46].proc)
! #define Py_NoSiteFlag (*(int(*))imports[47].proc)
! #define Py_OptimizeFlag (*(int(*))imports[48].proc)
--- 8,50 ----
  #define PyObject_CallFunction ((PyObject *(*)(PyObject *, char *, ...))imports[7].proc)
  #define PyString_AsStringAndSize ((int(*)(PyObject *, char **, int *))imports[8].proc)
! #define PyString_AsString ((char *(*)(PyObject *))imports[9].proc)
! #define PyArg_ParseTuple ((int(*)(PyObject *, char *, ...))imports[10].proc)
! #define PyErr_Format ((PyObject *(*)(PyObject *, const char *, ...))imports[11].proc)
! #define PyImport_ImportModule ((PyObject *(*)(char *))imports[12].proc)
! #define PyInt_FromLong ((PyObject *(*)(long))imports[13].proc)
! #define PyInt_AsLong ((long(*)(PyObject *))imports[14].proc)
! #define PyLong_FromVoidPtr ((PyObject *(*)(void *))imports[15].proc)
! #define Py_InitModule4 ((PyObject *(*)(char *, PyMethodDef *, char *, PyObject *, int))imports[16].proc)
! #define PyTuple_New ((PyObject *(*)(int))imports[17].proc)
! #define PyTuple_SetItem ((int(*)(PyObject*, int, PyObject *))imports[18].proc)
! #define Py_IsInitialized ((int(*)(void))imports[19].proc)
! #define PyObject_SetAttrString ((int(*)(PyObject *, char *, PyObject *))imports[20].proc)
! #define PyCFunction_NewEx ((PyObject *(*)(PyMethodDef *, PyObject *, PyObject *))imports[21].proc)
! #define PyObject_GetAttrString ((PyObject *(*)(PyObject *, char *))imports[22].proc)
! #define Py_BuildValue ((PyObject *(*)(char *, ...))imports[23].proc)
! #define PyObject_Call ((PyObject *(*)(PyObject *, PyObject *, PyObject *))imports[24].proc)
! #define PySys_WriteStderr ((void(*)(const char *, ...))imports[25].proc)
! #define PyErr_Occurred ((PyObject *(*)(void))imports[26].proc)
! #define PyErr_Clear ((void(*)(void))imports[27].proc)
! #define PyObject_IsInstance ((int(*)(PyObject *, PyObject *))imports[28].proc)
! #define PyInt_Type (*(PyObject(*))imports[29].proc)
! #define _Py_NoneStruct (*(PyObject(*))imports[30].proc)
! #define PyExc_ImportError (*(PyObject *(*))imports[31].proc)
! #define PyGILState_Ensure ((PyGILState_STATE(*)(void))imports[32].proc)
! #define PyGILState_Release ((void(*)(PyGILState_STATE))imports[33].proc)
! #define PySys_SetObject ((void(*)(char *, PyObject *))imports[34].proc)
! #define PySys_GetObject ((PyObject *(*)(char *))imports[35].proc)
! #define PyString_FromString ((PyObject *(*)(char *))imports[36].proc)
! #define Py_FdIsInteractive ((int(*)(FILE *, char *))imports[37].proc)
! #define PyRun_InteractiveLoop ((int(*)(FILE *, char *))imports[38].proc)
! #define PySys_SetArgv ((void(*)(int, char **))imports[39].proc)
! #define PyImport_AddModule ((PyObject *(*)(char *))imports[40].proc)
! #define PyModule_GetDict ((PyObject *(*)(PyObject *))imports[41].proc)
! #define PySequence_Length ((int(*)(PyObject *))imports[42].proc)
! #define PySequence_GetItem ((PyObject *(*)(PyObject *, int))imports[43].proc)
! #define PyEval_EvalCode ((PyObject *(*)(PyCodeObject *, PyObject *, PyObject *))imports[44].proc)
! #define PyErr_Print ((void(*)(void))imports[45].proc)
! #define PyBool_FromLong ((PyObject *(*)(long))imports[46].proc)
! #define Py_VerboseFlag (*(int(*))imports[47].proc)
! #define Py_NoSiteFlag (*(int(*))imports[48].proc)
! #define Py_OptimizeFlag (*(int(*))imports[49].proc)