From cc2f224c35c7d6109ea475ca24f9a5902b2364fc Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 5 Oct 2012 11:37:57 +0400
Subject: [PATCH] Include proper files in atomic_ops_malloc (code refactoring)

* src/atomic_ops_malloc.c: Include atomic_ops_malloc.h instead of
atomic_ops_stack.h (to verify function definitions match prototypes).
* src/atomic_ops_malloc.c: Include assert.h (since assert() is used).
* src/atomic_ops_malloc.h: Include stddef.h instead of stdlib.h for
size_t definition.
---
 src/atomic_ops_malloc.c | 5 ++++-
 src/atomic_ops_malloc.h | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/atomic_ops_malloc.c b/src/atomic_ops_malloc.c
index 9996c48..40d80f3 100644
--- a/src/atomic_ops_malloc.c
+++ b/src/atomic_ops_malloc.c
@@ -16,9 +16,12 @@
 #endif
 
 #define AO_REQUIRE_CAS
-#include "atomic_ops_stack.h"
+#include "atomic_ops_malloc.h"
+
 #include <string.h>     /* for ffs, which is assumed reentrant. */
 #include <stdlib.h>
+#include <assert.h>
+
 #ifdef AO_TRACE_MALLOC
 # include <stdio.h>
 # include <pthread.h>
diff --git a/src/atomic_ops_malloc.h b/src/atomic_ops_malloc.h
index 999e594..e324d5b 100644
--- a/src/atomic_ops_malloc.h
+++ b/src/atomic_ops_malloc.h
@@ -26,10 +26,10 @@
 #ifndef AO_MALLOC_H
 #define AO_MALLOC_H
 
-#include <stdlib.h>     /* For size_t */
-
 #include "atomic_ops_stack.h"
 
+#include <stddef.h> /* for size_t */
+
 #ifdef AO_STACK_IS_LOCK_FREE
 # define AO_MALLOC_IS_LOCK_FREE
 #endif
-- 
2.7.4