Changeset 391 for python/trunk/RISCOS/Python

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)
• RISCOS/Python/dynload_riscos.c (modified) (2 diffs)
• RISCOS/Python/getmtime_riscos.c (deleted)

python/trunk/RISCOS/Python/dynload_riscos.c

@@ -40 +40 @@
 
 const struct filedescr _PyImport_DynLoadFiletab[] = {
-        {"/pyd", "rb", C_EXTENSION},
-        {0, 0}
+    {"/pyd", "rb", C_EXTENSION},
+    {0, 0}
 };
 
@@ -49 +49 @@
 
 dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
-                                    char *pathname, FILE *fp)
+                                    char *pathname, FILE *fp)
 {
-        int err;
-        char errstr[256];
-        void (*init_function)(void);
+    int err;
+    char errstr[256];
+    void (*init_function)(void);
 
-        err = dlk_load_no_init(pathname, &init_function);
-        if (err) {
-            PyOS_snprintf(errstr, sizeof(errstr), "dlk failure %d", err);
-            PyErr_SetString(PyExc_ImportError, errstr);
-        }
-        return init_function;
+    err = dlk_load_no_init(pathname, &init_function);
+    if (err) {
+        PyOS_snprintf(errstr, sizeof(errstr), "dlk failure %d", err);
+        PyErr_SetString(PyExc_ImportError, errstr);
+    }
+    return init_function;
 }