[Python-checkins] r84331 - python/branches/pep-0384/Include/import.h

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Aug 27 21:12:59 2010
New Revision: 84331

Log:
Fix merging glitch.


Modified:
   python/branches/pep-0384/Include/import.h

Modified: python/branches/pep-0384/Include/import.h
==============================================================================
--- python/branches/pep-0384/Include/import.h	(original)
+++ python/branches/pep-0384/Include/import.h	Fri Aug 27 21:12:59 2010
@@ -38,11 +38,6 @@
 #define _PyImport_ReleaseLock() 1
 #endif
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(struct filedescr *) _PyImport_FindModule(
-	const char *, PyObject *, char *, size_t, FILE **, PyObject **);
-#endif
-PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *);
 PyAPI_FUNC(void) _PyImport_ReInitLock(void);
 
 PyAPI_FUNC(PyObject *)_PyImport_FindExtension(char *, char *);