From dcb070cc84ec2a9a1b67069764c835b4812d6cd5 Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 9 Sep 2011 13:17:40 +0400
Subject: [PATCH] Adjust AO_..._H macros in public headers.

* src/atomic_ops.h (ATOMIC_OPS_H): Add AO_ prefix.
* src/atomic_ops/generalize.h (ATOMIC_OPS_H): Likewise.
* src/atomic_ops/sysdeps/emul_cas.h (ATOMIC_OPS_H): Likewise.
* src/atomic_ops/generalize.h (ATOMIC_OPS_H): Adjust #error message.
* src/atomic_ops_malloc.h (AO_ATOMIC_H): Rename to AO_MALLOC_H.
---
 src/atomic_ops.h                  | 7 +++----
 src/atomic_ops/generalize.h       | 4 ++--
 src/atomic_ops/sysdeps/emul_cas.h | 4 ++--
 src/atomic_ops_malloc.h           | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/atomic_ops.h b/src/atomic_ops.h
index c971f06..eff8868 100644
--- a/src/atomic_ops.h
+++ b/src/atomic_ops.h
@@ -20,9 +20,8 @@
  * SOFTWARE.
  */
 
-#ifndef ATOMIC_OPS_H
-
-#define ATOMIC_OPS_H
+#ifndef AO_ATOMIC_OPS_H
+#define AO_ATOMIC_OPS_H
 
 #include <assert.h>
 #include <stddef.h>
@@ -373,4 +372,4 @@
 #define AO_T AO_t
 #define AO_TS_VAL AO_TS_VAL_t
 
-#endif /* ATOMIC_OPS_H */
+#endif /* !AO_ATOMIC_OPS_H */
diff --git a/src/atomic_ops/generalize.h b/src/atomic_ops/generalize.h
index e895a1d..91a96fe 100644
--- a/src/atomic_ops/generalize.h
+++ b/src/atomic_ops/generalize.h
@@ -43,8 +43,8 @@
  * file must define AO_NO_DD_ORDERING.
  */
 
-#ifndef ATOMIC_OPS_H
-# error Atomic_ops_generalize.h should not be included directly.
+#ifndef AO_ATOMIC_OPS_H
+# error This file should not be included directly.
 #endif
 
 #if AO_CHAR_TS_T
diff --git a/src/atomic_ops/sysdeps/emul_cas.h b/src/atomic_ops/sysdeps/emul_cas.h
index 13fb227..7c08906 100644
--- a/src/atomic_ops/sysdeps/emul_cas.h
+++ b/src/atomic_ops/sysdeps/emul_cas.h
@@ -35,8 +35,8 @@
  * operate on compare_and_swap locations.
  */
 
-#if !defined(ATOMIC_OPS_H)
-#  error This file should not be included directly.
+#ifndef AO_ATOMIC_OPS_H
+# error This file should not be included directly.
 #endif
 
 #ifndef AO_HAVE_double_t
diff --git a/src/atomic_ops_malloc.h b/src/atomic_ops_malloc.h
index 23ada61..04f8583 100644
--- a/src/atomic_ops_malloc.h
+++ b/src/atomic_ops_malloc.h
@@ -23,8 +23,8 @@
 /* Almost lock-free malloc implementation based on stack implementation. */
 /* See doc/README_malloc.txt file for detailed usage rules.              */
 
-#ifndef AO_ATOMIC_H
-#define AO_ATOMIC_H
+#ifndef AO_MALLOC_H
+#define AO_MALLOC_H
 
 #include <stdlib.h>     /* For size_t */
 
@@ -41,4 +41,4 @@ void * AO_malloc(size_t);
 /* Allow use of mmpa to grow the heap.  No-op on some platforms.        */
 void AO_malloc_enable_mmap(void);
 
-#endif /* !AO_ATOMIC_H */
+#endif /* !AO_MALLOC_H */
-- 
2.50.1