Minor tweak to last commit

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index e978f15bc24947013ebd49b430172e9920ca5321..69eaee3ced9d806b700072624ca9d09d1cb151b7 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -22,10 +22,9 @@
 LDAP_BEGIN_DECL
 
 /* for allocating aligned buffers (on the stack) */
-#define LBER_ALIGN_BUFFER(uname,size) \
-       union LDAP_CONCAT(lber_,uname) { \
+#define LBER_ALIGNED_BUFFER(uname,size) \
+       union uname { \
                char buffer[size]; \
-               \
                /* force alignment */ \
                int ialign; \
                long lalign; \
@@ -35,7 +34,8 @@ LDAP_BEGIN_DECL
        }
 
 #define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */
-typedef LBER_ALIGN_BUFFER(berelement_u,LBER_ELEMENT_SIZEOF) BerElementBuffer;
+typedef LBER_ALIGNED_BUFFER(lber_berelement_u,LBER_ELEMENT_SIZEOF)
+       BerElementBuffer;
 
 typedef struct sockbuf_buf {
        ber_len_t               buf_size;