Index: /trunk/lib/buffer.hpp
===================================================================
--- /trunk/lib/buffer.hpp	(revision 2157)
+++ /trunk/lib/buffer.hpp	(revision 2159)
@@ -40,32 +40,32 @@
     base_ptr = &aligned_##base_ptr[0];\
 
-#define ALLOC_STATIC_ALIGNED_BYTE_BUFFER_WITH_COPYBACK(copyback_ptr, base_ptr, copyback_size, buffer_size) \
-    ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base_ptr[buffer_size/sizeof(BitBlock)]; \
+#define ALLOC_STATIC_ALIGNED_BYTE_BUFFER_WITH_COPYBACK(copyback_ptr, base_ptr) \
+    ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base_ptr[BUFFER_SIZE/sizeof(BitBlock)]; \
     assert_bitblock_align((void*)aligned_##base_ptr);\
     copyback_ptr = (uint8_t *)aligned_##base_ptr; \
-    memset(copyback_ptr,0,copyback_size); \
-    base_ptr = (uint8_t *)&copyback_ptr[copyback_size/BLOCK_SIZE]; \
+    memset(copyback_ptr,0,COPYBACK_SIZE); \
+    base_ptr = &copyback_ptr[COPYBACK_SIZE]; \
 
-#define ALLOC_STATIC_ALIGNED_BITBLOCK_BUFFER_WITH_COPYBACK(copyback_ptr, base_ptr, copyback_size, buffer_size) \
-    ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base_ptr[buffer_size/sizeof(BitBlock)/8]; \
+#define ALLOC_STATIC_ALIGNED_BITBLOCK_BUFFER_WITH_COPYBACK(copyback_ptr, base_ptr) \
+    ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base_ptr[BUFFER_SIZE/sizeof(BitBlock)/8]; \
     assert_bitblock_align((void*)aligned_##base_ptr);\
     copyback_ptr = (BitBlock *) aligned_##base_ptr; \
-    memset(copyback_ptr,0,copyback_size/8); \
-    base_ptr = &copyback_ptr[copyback_size/BLOCK_SIZE]; \
+    memset(copyback_ptr,0,COPYBACK_SIZE/8); \
+    base_ptr = &copyback_ptr[COPYBACK_BLOCKS]; \
 
-#define COPY_BACK_BYTE_BUFFER(copyback_ptr, base_ptr, copyback_size, segment_size) \
+#define COPY_BACK_BYTE_BUFFER(copyback_ptr, base_ptr) \
 do {	void * dest = copyback_ptr;\
-    void * src = (uint8_t *)base_ptr + (segment_size - copyback_size);\
-	assert_bitblock_align(src);\
-	assert_bitblock_align(dest);\
-    memmove(dest, src, copyback_size);\
+    void * src = (uint8_t *)base_ptr + (SEGMENT_SIZE - COPYBACK_SIZE);\
+    assert_bitblock_align(src);\
+    assert_bitblock_align(dest);\
+    memmove(dest, src, COPYBACK_SIZE);\
 } while(0)
 
-#define COPY_BACK_BITBLOCK_BUFFER(copyback_ptr, base_ptr, copyback_size, segment_size) \
+#define COPY_BACK_BITBLOCK_BUFFER(copyback_ptr, base_ptr) \
 do {	void * dest = copyback_ptr;\
-    void * src = (uint8_t *)base_ptr + ((segment_size - copyback_size)/8);\
-	assert_bitblock_align(src);\
-	assert_bitblock_align(dest);\
-    memmove(dest, src, copyback_size/8);\
+    void * src = (uint8_t *)base_ptr + ((SEGMENT_SIZE - COPYBACK_SIZE)/8);\
+    assert_bitblock_align(src);\
+    assert_bitblock_align(dest);\
+    memmove(dest, src, COPYBACK_SIZE/8);\
 } while(0)