From 608a12659f15d57abf42a972c1e56c6a24cfe244 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 21 Apr 2012 22:14:22 +0000
Subject: 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.
---
 pthread/pt-create.c   | 2 +-
 pthread/pt-exit.c     | 2 +-
 pthread/pt-internal.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pthread')

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>
 
-- 
cgit v1.2.3