[Python-checkins] r83300 - in python/branches/import_unicode: Include/Python.h Modules/zipimport.c Python/import.c

[victor.stinner]

Author: victor.stinner
Date: Fri Jul 30 22:26:57 2010
New Revision: 83300

Log:
declare _Py_fopen() in Python.h

mark _Py_stat() as static

Modified:
   python/branches/import_unicode/Include/Python.h
   python/branches/import_unicode/Modules/zipimport.c
   python/branches/import_unicode/Python/import.c

Modified: python/branches/import_unicode/Include/Python.h
==============================================================================
--- python/branches/import_unicode/Include/Python.h	(original)
+++ python/branches/import_unicode/Include/Python.h	Fri Jul 30 22:26:57 2010
@@ -132,6 +132,9 @@
 PyAPI_FUNC(wchar_t *) _Py_char2wchar(char *);
 PyAPI_FUNC(char*) _Py_wchar2char(const wchar_t *text);
 
+/* _Py_fopen lives in import.c */
+PyAPI_FUNC(FILE*) _Py_fopen(PyObject *unicode, const char *mode);
+
 #ifdef __cplusplus
 }
 #endif

Modified: python/branches/import_unicode/Modules/zipimport.c
==============================================================================
--- python/branches/import_unicode/Modules/zipimport.c	(original)
+++ python/branches/import_unicode/Modules/zipimport.c	Fri Jul 30 22:26:57 2010
@@ -44,7 +44,6 @@
 static PyObject *zip_directory_cache = NULL;
 
 /* forward decls */
-extern FILE* _Py_fopen(PyObject *unicode, const char *mode);
 static PyObject *read_directory(PyObject *archive);
 static PyObject *get_data(PyObject *archive, PyObject *toc_entry);
 static PyObject *get_module_code(ZipImporter *self, char *fullname,

Modified: python/branches/import_unicode/Python/import.c
==============================================================================
--- python/branches/import_unicode/Python/import.c	(original)
+++ python/branches/import_unicode/Python/import.c	Fri Jul 30 22:26:57 2010
@@ -139,7 +139,7 @@
 /* Forward */
 FILE* _Py_fopen(PyObject *unicode, const char *mode);
 #ifdef HAVE_STAT
-int _Py_stat(PyObject *unicode, struct stat *statbuf);
+static int _Py_stat(PyObject *unicode, struct stat *statbuf);
 static int find_init_module(PyObject *);
 #endif
 
@@ -2161,7 +2161,7 @@
 
 
 #ifdef HAVE_STAT
-int
+static int
 _Py_stat(PyObject *unicode, struct stat *statbuf)
 {
 #ifdef MS_WINDOWS