/*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: nmem.c,v 1.9 2005-01-04 01:25:20 adam Exp $
+ * $Id: nmem.c,v 1.12 2005-01-15 19:47:14 adam Exp $
*/
/**
#include <assert.h>
#include <string.h>
#include <errno.h>
+#include <stddef.h>
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
#endif
#define NMEM_CHUNK (4*1024)
-#define NMEM_ALIGN (sizeof(long)*2)
+
+struct align {
+ char x;
+ union {
+ char c;
+ short s;
+ int i;
+ long l;
+#if HAVE_LONG_LONG
+ long long ll;
+#endif
+ float f;
+ double d;
+ } u;
+};
+
+#define NMEM_ALIGN (offsetof(struct align, u))
static int log_level=0;
static int log_level_initialized=0;