On ia64 and PPC platforms I saw: ../nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c: In function `__pthread_setaffinity_new': ../nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c:80: error: redeclaration of `err' ../nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c:62: error: `err' previously declared here ../nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c:62: warning: unused variable `err' make[2]: *** [/usr/src/packages/BUILD/glibc-2.3/cc-nptl/nptl/pthread_setaffinity.o] Error 1 The appended patch fixes the problems and the old interface. Ok to commit? Andreas 2004-03-20 Andreas Jaeger * sysdeps/unix/sysv/linux/pthread_setaffinity.c (__pthread_setaffinity_old): Fix interface. * sysdeps/unix/sysv/linux/pthread_getaffinity.c (__pthread_getaffinity_old): Likewise. * sysdeps/unix/sysv/linux/pthread_setaffinity.c (__pthread_setaffinity_new): Remove duplicate declaration. ============================================================ Index: nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c --- nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c 18 Mar 2004 23:55:19 -0000 1.3 +++ nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c 20 Mar 2004 06:56:21 -0000 @@ -50,10 +50,10 @@ versioned_symbol (libpthread, __pthread_ #if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4) int -__pthread_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset) +__pthread_getaffinity_old (pthread_t th, cpu_set_t *cpuset) { /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_getaffinity_new (attr, 128, cpuset); + return __pthread_getaffinity_new (th, 128, cpuset); } compat_symbol (libpthread, __pthread_getaffinity_old, pthread_getaffinity_np, GLIBC_2_3_3); ============================================================ Index: nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c --- nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c 18 Mar 2004 23:55:19 -0000 1.2 +++ nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c 20 Mar 2004 06:56:21 -0000 @@ -77,7 +77,6 @@ __pthread_setaffinity_new (pthread_t th, fulfilled. */ return EINVAL; - INTERNAL_SYSCALL_DECL (err); res = INTERNAL_SYSCALL (sched_setaffinity, err, 3, pd->tid, cpusetsize, cpuset); return (INTERNAL_SYSCALL_ERROR_P (res, err) @@ -90,10 +89,10 @@ versioned_symbol (libpthread, __pthread_ #if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4) int -__pthread_setaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset) +__pthread_setaffinity_old (pthread_t th, cpu_set_t *cpuset) { /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_setaffinity_new (attr, 128, cpuset); + return __pthread_setaffinity_new (th, 128, cpuset); } compat_symbol (libpthread, __pthread_setaffinity_old, pthread_setaffinity_np, GLIBC_2_3_3); -- Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj SuSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126