Changeset 391 for python/trunk/Include/sysmodule.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Include/sysmodule.h (modified) (2 diffs)

python/trunk/Include/sysmodule.h

@@ -12 +12 @@
 PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *);
 PyAPI_FUNC(void) PySys_SetArgv(int, char **);
+PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int);
 PyAPI_FUNC(void) PySys_SetPath(char *);
 
@@ -18 +19 @@
 PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
                         Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-
-PyAPI_DATA(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc;
-PyAPI_DATA(int) _PySys_CheckInterval;
 
 PyAPI_FUNC(void) PySys_ResetWarnOptions(void);