diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-21 22:14:22 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-21 22:14:22 +0000 |
| commit | 608a12659f15d57abf42a972c1e56c6a24cfe244 (patch) | |
| tree | 7e454276df6dece4d32b1098d1570d18aedfff73 | |
| parent | 51feb14bff6b4aa70e2f13a54e26a6b270de3e4d (diff) | |
Rename bits/atomic.h to bits/pt-atomic.h
This avoids a conflict with glibc-provided bits/atomic.h
* sysdeps/ia32/bits/atomic.h: Rename to...
* sysdeps/ia32/bits/pt-atomic.h: ... this.
* pthread/pt-create.c: Include <bits/pt-atomic.h> instead of <bits/atomic.h>
* pthread/pt-exit.c: Likewise.
* pthread/pt-internal.h: Likewise.
| -rw-r--r-- | pthread/pt-create.c | 2 | ||||
| -rw-r--r-- | pthread/pt-exit.c | 2 | ||||
| -rw-r--r-- | pthread/pt-internal.h | 2 | ||||
| -rw-r--r-- | sysdeps/ia32/bits/pt-atomic.h (renamed from sysdeps/ia32/bits/atomic.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 346c697..ca6b66c 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -22,7 +22,7 @@ #include <pthread.h> #include <signal.h> -#include <bits/atomic.h> +#include <bits/pt-atomic.h> #include <pt-internal.h> diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index 53a0427..c47b604 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -24,7 +24,7 @@ #include <pt-internal.h> -#include <bits/atomic.h> +#include <bits/pt-atomic.h> /* Terminate the current thread and make STATUS available to any diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index 3f69d2d..94bc9a7 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -26,7 +26,7 @@ #include <signal.h> #include <assert.h> -#include <bits/atomic.h> +#include <bits/pt-atomic.h> #include <pt-key.h> diff --git a/sysdeps/ia32/bits/atomic.h b/sysdeps/ia32/bits/pt-atomic.h index 0dfc1f6..0dfc1f6 100644 --- a/sysdeps/ia32/bits/atomic.h +++ b/sysdeps/ia32/bits/pt-atomic.h |