Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Python/importdl.h

    r2 r391  
    99/* Definitions for dynamic loading of extension modules */
    1010enum filetype {
    11         SEARCH_ERROR,
    12         PY_SOURCE,
    13         PY_COMPILED,
    14         C_EXTENSION,
    15         PY_RESOURCE, /* Mac only */
    16         PKG_DIRECTORY,
    17         C_BUILTIN,
    18         PY_FROZEN,
    19         PY_CODERESOURCE, /* Mac only */
    20         IMP_HOOK
     11    SEARCH_ERROR,
     12    PY_SOURCE,
     13    PY_COMPILED,
     14    C_EXTENSION,
     15    PY_RESOURCE, /* Mac only */
     16    PKG_DIRECTORY,
     17    C_BUILTIN,
     18    PY_FROZEN,
     19    PY_CODERESOURCE, /* Mac only */
     20    IMP_HOOK
    2121};
    2222
    2323struct filedescr {
    24         char *suffix;
    25         char *mode;
    26         enum filetype type;
     24    char *suffix;
     25    char *mode;
     26    enum filetype type;
    2727};
    2828extern struct filedescr * _PyImport_Filetab;
     
    3030
    3131extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
    32                                              FILE *);
     32                                             FILE *);
    3333
    3434/* Max length of module suffix searched for -- accommodates "module.slb" */
Note: See TracChangeset for help on using the changeset viewer.