Removed zebra_timing_t. Using yaz_timing_t instead. Requires YAZ 2.1.45.

[idzebra-moved-to-github.git] / include / idzebra / util.h

diff --git a/include/idzebra/util.h b/include/idzebra/util.h
index 5952655..7cc4512 100644 (file)
--- a/include/idzebra/util.h
+++ b/include/idzebra/util.h
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.8 2006-08-14 10:40:14 adam Exp $
+/* $Id: util.h,v 1.14 2007-01-05 10:45:11 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -28,6 +28,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <idzebra/version.h>
 
+/**
+  expand GCC_ATTRIBUTE if GCC is in use. See :
+  http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
+
+  To see gcc pre-defines for c:
+  gcc -E -dM -x c /dev/null
+*/
+
+#ifdef __GNUC__
+#if __GNUC__ >= 4
+#define ZEBRA_GCC_ATTR(x) __attribute__ (x)
+#endif
+#endif
+
+#ifndef ZEBRA_GCC_ATTR
+#define ZEBRA_GCC_ATTR(x)
+#endif
+
 /* check that we don't have all too old yaz */
 #ifndef YLOG_ERRNO
 #error Need a modern yaz with YLOG_ defines
@@ -42,22 +60,27 @@ YAZ_BEGIN_CDECL
  * number of occurrences etc. It is a "large" integer and is usually
  * 64-bit on newer architectures.
  */
-#ifdef __GNUC__
-typedef long long int zint;
-#define ZINT_FORMAT "%lld"
-#define ZINT_FORMAT0 "lld"
-#else
 #ifdef WIN32
 typedef __int64 zint;
-#define ZINT_FORMAT "%I64d"
 #define ZINT_FORMAT0 "I64d"
 #else
+
+#ifndef ZEBRA_ZINT
+#error ZEBRA_ZINT undefined. idzebra-config not in use?
+#endif
+
+#if ZEBRA_ZINT > 0
+typedef long long int zint;
+#define ZINT_FORMAT0 "lld"
+#else
 typedef long zint;
-#define ZINT_FORMAT "%ld"
 #define ZINT_FORMAT0 "ld"
 #endif
+
 #endif
 
+#define ZINT_FORMAT "%" ZINT_FORMAT0
+
 /** \var typedef ZEBRA_RES
  * \brief Common return type for Zebra API
  *
@@ -68,16 +91,15 @@ typedef short ZEBRA_RES;
 #define ZEBRA_FAIL -1
 #define ZEBRA_OK   0
 
-typedef zint SYSNO;
+YAZ_EXPORT zint atoi_zn(const char *buf, zint len);
+
+YAZ_EXPORT void zebra_zint_encode(char **dst, zint pos);
 
-YAZ_EXPORT
-zint atoi_zn (const char *buf, zint len);
+YAZ_EXPORT void zebra_zint_decode(const char **src, zint *pos);
 
-YAZ_EXPORT
-void zebra_zint_encode(char **dst, zint pos);
+YAZ_EXPORT void zebra_exit(const char *msg);
 
-YAZ_EXPORT
-void zebra_zint_decode(const char **src, zint *pos);
+YAZ_EXPORT zint atozint(const char *src);
 
 YAZ_END_CDECL