diff --git a/ChangeLog b/ChangeLog
index 995c2b8f41..3730e1f685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sched_getaffinity.c: Prepend GLIBC_ to
+	version names is SHLIB_COMPAT check.
+	* sysdeps/unix/sysv/linux/sched_setaffinity.c: Likewise.
+
 2004-03-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* nis/nss_nis/nis-rpc.c (saveit): Improve memory handling.  No need to
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 43dfc3b63c..4e400f67f9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c
+	(__pthread_attr_setaffinity_old): Prepend GLIBC_ to version names
+	is SHLIB_COMPAT check.
+	* sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c
+	(__pthread_attr_getaffinity_old): Likewise.
+	* sysdeps/unix/sysv/linux/pthread_getaffinity.c
+	(__pthread_getaffinity_old): Likewise.
+	* sysdeps/unix/sysv/linux/pthread_setaffinity.c
+	(__pthread_setaffinity_old): Likewise.
+
 2004-03-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* allocatestack.c (_make_stacks_executable): Call
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c
index 6620172b58..1c92f314d0 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c
@@ -57,7 +57,7 @@ versioned_symbol (libpthread, __pthread_attr_getaffinity_new,
 		  pthread_attr_getaffinity_np, GLIBC_2_3_4);
 
 
-#if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_attr_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset)
 {
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c
index 03cb4577a5..ca84f1c9bd 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c
@@ -83,7 +83,7 @@ versioned_symbol (libpthread, __pthread_attr_setaffinity_new,
 		  pthread_attr_setaffinity_np, GLIBC_2_3_4);
 
 
-#if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_attr_setaffinity_old (pthread_attr_t *attr, cpu_set_t *cpuset)
 {
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c
index 89edef65c1..c382ed53ab 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c
@@ -48,7 +48,7 @@ versioned_symbol (libpthread, __pthread_getaffinity_new,
 		  pthread_getaffinity_np, GLIBC_2_3_4);
 
 
-#if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_getaffinity_old (pthread_t th, cpu_set_t *cpuset)
 {
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
index d436b08466..5b24c694a9 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
@@ -87,7 +87,7 @@ versioned_symbol (libpthread, __pthread_setaffinity_new,
 		  pthread_setaffinity_np, GLIBC_2_3_4);
 
 
-#if SHLIB_COMPAT(libpthread, 2_3_3, 2_3_4)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 __pthread_setaffinity_old (pthread_t th, cpu_set_t *cpuset)
 {
diff --git a/sysdeps/unix/sysv/linux/sched_getaffinity.c b/sysdeps/unix/sysv/linux/sched_getaffinity.c
index 8503843788..50443c6482 100644
--- a/sysdeps/unix/sysv/linux/sched_getaffinity.c
+++ b/sysdeps/unix/sysv/linux/sched_getaffinity.c
@@ -43,7 +43,7 @@ versioned_symbol (libc, __sched_getaffinity_new, sched_getaffinity,
 		  GLIBC_2_3_4);
 
 
-# if SHLIB_COMPAT(libc, 2_3_3, 2_3_4)
+# if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 attribute_compat_text_section
 __sched_getaffinity_old (pid_t pid, cpu_set_t *cpuset)
diff --git a/sysdeps/unix/sysv/linux/sched_setaffinity.c b/sysdeps/unix/sysv/linux/sched_setaffinity.c
index 457dacd7b4..36f73d4a59 100644
--- a/sysdeps/unix/sysv/linux/sched_setaffinity.c
+++ b/sysdeps/unix/sysv/linux/sched_setaffinity.c
@@ -70,7 +70,7 @@ versioned_symbol (libc, __sched_setaffinity_new, sched_setaffinity,
 		  GLIBC_2_3_4);
 
 
-# if SHLIB_COMPAT(libc, 2_3_3, 2_3_4)
+# if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4)
 int
 attribute_compat_text_section
 __sched_setaffinity_old (pid_t pid, const cpu_set_t *cpuset)