/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data.
+ * Copyright (C) 1995-2011 Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
typedef struct nmem_control *NMEM;
/** \brief Set to 1 if YAZ BER integer is 64-bit ; 0 otherwise */
-#define NMEM_64 0
+#ifndef NMEM_64
+#define NMEM_64 1
+#endif
#if NMEM_64
-/** \brief BER/utility integer (64-bit or more) */
+
+#ifdef _MSC_VER
+/* Visual Studio. 6.0 and later supports this */
+typedef __int64 nmem_int_t;
+#define NMEM_INT_PRINTF "%I64d"
+#else
+/* C99 */
typedef long long int nmem_int_t;
-/** \brief printf format for nmem_int_t type */
#define NMEM_INT_PRINTF "%lld"
+#endif
+
#else
/** \brief BER/utility integer (32-bit on most platforms) */
typedef int nmem_int_t;
/** \brief returns size in bytes of memory for NMEM handle
\returns number of bytes
*/
-YAZ_EXPORT int nmem_total(NMEM n);
+YAZ_EXPORT size_t nmem_total(NMEM n);
/** \brief allocates string on NMEM handle (similar strdup)
\param mem HNEM handle
\param size number of bytes to be allocated
\returns pointer to allocated memory
*/
-YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
+YAZ_EXPORT void *nmem_malloc(NMEM n, size_t size);
YAZ_END_CDECL