9 files changed, 8 insertions, 26 deletions
diff --git a/libclc/generic/include/clc/atomic/atomic_add.h b/libclc/generic/include/clc/atomic/atomic_add.h
index 7dd4fd3c682..302e4fbc51b 100644
--- a/libclc/generic/include/clc/atomic/atomic_add.h
+++ b/libclc/generic/include/clc/atomic/atomic_add.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_add
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_and.h b/libclc/generic/include/clc/atomic/atomic_and.h
index a198c46b7ee..4759b9f96e0 100644
--- a/libclc/generic/include/clc/atomic/atomic_and.h
+++ b/libclc/generic/include/clc/atomic/atomic_and.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_and
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_decl.inc b/libclc/generic/include/clc/atomic/atomic_decl.inc
index 49ccde2bae5..4d81ac13900 100644
--- a/libclc/generic/include/clc/atomic/atomic_decl.inc
+++ b/libclc/generic/include/clc/atomic/atomic_decl.inc
@@ -1,4 +1,3 @@
-
 #define __CLC_DECLARE_ATOMIC(ADDRSPACE, TYPE) \
 	_CLC_OVERLOAD _CLC_DECL TYPE __CLC_FUNCTION (volatile ADDRSPACE TYPE *, TYPE);
 
@@ -8,3 +7,8 @@
 
 __CLC_DECLARE_ATOMIC_ADDRSPACE(int)
 __CLC_DECLARE_ATOMIC_ADDRSPACE(uint)
+
+#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
+#undef __CLC_DECLARE_ATOMIC
+
+#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/atomic/atomic_max.h b/libclc/generic/include/clc/atomic/atomic_max.h
index ed09ec9caef..f6803c47e43 100644
--- a/libclc/generic/include/clc/atomic/atomic_max.h
+++ b/libclc/generic/include/clc/atomic/atomic_max.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_max
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_min.h b/libclc/generic/include/clc/atomic/atomic_min.h
index 6a46af403d0..dfa8179db6f 100644
--- a/libclc/generic/include/clc/atomic/atomic_min.h
+++ b/libclc/generic/include/clc/atomic/atomic_min.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_min
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_or.h b/libclc/generic/include/clc/atomic/atomic_or.h
index 2369d81a3a0..64ce311216e 100644
--- a/libclc/generic/include/clc/atomic/atomic_or.h
+++ b/libclc/generic/include/clc/atomic/atomic_or.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_or
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_sub.h b/libclc/generic/include/clc/atomic/atomic_sub.h
index 993e995001f..0d2f99e68de 100644
--- a/libclc/generic/include/clc/atomic/atomic_sub.h
+++ b/libclc/generic/include/clc/atomic/atomic_sub.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_sub
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_xchg.h b/libclc/generic/include/clc/atomic/atomic_xchg.h
index ebe0d9af809..59a95723423 100644
--- a/libclc/generic/include/clc/atomic/atomic_xchg.h
+++ b/libclc/generic/include/clc/atomic/atomic_xchg.h
@@ -1,6 +1,5 @@
 #define __CLC_FUNCTION atomic_xchg
+
+_CLC_OVERLOAD _CLC_DECL float __CLC_FUNCTION (volatile local float *, float);
+_CLC_OVERLOAD _CLC_DECL float __CLC_FUNCTION (volatile global float *, float);
 #include <clc/atomic/atomic_decl.inc>
-__CLC_DECLARE_ATOMIC_ADDRSPACE(float);
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/libclc/generic/include/clc/atomic/atomic_xor.h b/libclc/generic/include/clc/atomic/atomic_xor.h
index 2cb74803ca9..1318bf20ae0 100644
--- a/libclc/generic/include/clc/atomic/atomic_xor.h
+++ b/libclc/generic/include/clc/atomic/atomic_xor.h
@@ -1,5 +1,2 @@
 #define __CLC_FUNCTION atomic_xor
 #include <clc/atomic/atomic_decl.inc>
-#undef __CLC_FUNCTION
-#undef __CLC_DECLARE_ATOMIC
-#undef __CLC_DECLARE_ATOMIC_ADDRSPACE