summaryrefslogtreecommitdiffstats
path: root/RISCOS/Python
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-09 15:15:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-09 15:15:40 (GMT)
commitc7c96a90bcf1366ac6f350f5506d0afee611e351 (patch)
tree4134c189d25fe972f2717f4b642a26e5f323a922 /RISCOS/Python
parentba32864b2d97018c71ce90926c853a67e79becf7 (diff)
downloadcpython-c7c96a90bcf1366ac6f350f5506d0afee611e351.zip
cpython-c7c96a90bcf1366ac6f350f5506d0afee611e351.tar.gz
cpython-c7c96a90bcf1366ac6f350f5506d0afee611e351.tar.bz2
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
Diffstat (limited to 'RISCOS/Python')
-rw-r--r--RISCOS/Python/dynload_riscos.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/RISCOS/Python/dynload_riscos.c b/RISCOS/Python/dynload_riscos.c
index 6b87f2d..8ecb29d 100644
--- a/RISCOS/Python/dynload_riscos.c
+++ b/RISCOS/Python/dynload_riscos.c
@@ -39,8 +39,8 @@ PERFORMANCE OF THIS SOFTWARE.
const struct filedescr _PyImport_DynLoadFiletab[] = {
- {"/pyd", "rb", C_EXTENSION},
- {0, 0}
+ {"/pyd", "rb", C_EXTENSION},
+ {0, 0}
};
void dynload_init_dummy()
@@ -48,16 +48,16 @@ void dynload_init_dummy()
}
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);
-
- 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;
+ 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;
}