projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a few redundant include(s).
[idzebra-moved-to-github.git]
/
include
/
idzebra
/
util.h
diff --git
a/include/idzebra/util.h
b/include/idzebra/util.h
index
2abf9cf
..
f53a48a
100644
(file)
--- a/
include/idzebra/util.h
+++ b/
include/idzebra/util.h
@@
-1,8
+1,5
@@
-/* $Id: util.h,v 1.9 2006-10-10 14:45:42 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-26,11
+23,22
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/yconfig.h>
#include <yaz/log.h>
#include <yaz/yconfig.h>
#include <yaz/log.h>
-#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
+*/
-/* check that we don't have all too old yaz */
-#ifndef YLOG_ERRNO
-#error Need a modern yaz with YLOG_ defines
+#ifdef __GNUC__
+#if __GNUC__ >= 4
+#define ZEBRA_GCC_ATTR(x) __attribute__ (x)
+#endif
+#endif
+
+#ifndef ZEBRA_GCC_ATTR
+#define ZEBRA_GCC_ATTR(x)
#endif
YAZ_BEGIN_CDECL
#endif
YAZ_BEGIN_CDECL
@@
-73,16
+81,15
@@
typedef short ZEBRA_RES;
#define ZEBRA_FAIL -1
#define ZEBRA_OK 0
#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
YAZ_END_CDECL
@@
-93,6
+100,7
@@
YAZ_END_CDECL
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab