diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 11:06:26 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 11:06:26 +0300 |
| commit | 2b4338c5e090fa94a32d5cd7154aef5dfe25e6da (patch) | |
| tree | 665a409563a70f93da9fb962f7a7da81aee8b93f /Python/dynload_aix.c | |
| parent | 0ab6fc6fe33837bc950d2cb0a5cf2a25579f8f3e (diff) | |
| parent | 22388c044ed1680554f5c8b1ef9dc1deaa84ad08 (diff) | |
| download | cpython-2b4338c5e090fa94a32d5cd7154aef5dfe25e6da.tar.gz | |
Merge with 3.2.
Diffstat (limited to 'Python/dynload_aix.c')
| -rw-r--r-- | Python/dynload_aix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c index 149990d799..6287c86edf 100644 --- a/Python/dynload_aix.c +++ b/Python/dynload_aix.c @@ -129,7 +129,6 @@ aix_loaderror(const char *pathname) {L_ERROR_ERRNO, NULL} }; -#define LOAD_ERRTAB_LEN (sizeof(load_errtab)/sizeof(load_errtab[0])) #define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1) PyOS_snprintf(errbuf, sizeof(errbuf), "from module %.200s ", pathname); @@ -140,7 +139,7 @@ aix_loaderror(const char *pathname) } for(i = 0; message[i] && *message[i]; i++) { int nerr = atoi(message[i]); - for (j=0; j<LOAD_ERRTAB_LEN ; j++) { + for (j=0; j < Py_ARRAY_LENGTH(load_errtab); j++) { if (nerr == load_errtab[j].errNo && load_errtab[j].errstr) ERRBUF_APPEND(load_errtab[j].errstr); } @@ -154,7 +153,7 @@ aix_loaderror(const char *pathname) } -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *pathname, FILE *fp) { dl_funcptr p; |