X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fz-proto.h;h=0c255c7df995ced20d45ff2bd12e34b91ce43cb6;hb=c5f9b67c889e65446bcbf727bef3705229c3fd7f;hp=b6576b1b81c08a5e340ebca673cef52cc3dbe360;hpb=d205d4870b1d64af05e9d6f6a2223086af4cce9e;p=yaz-moved-to-github.git diff --git a/include/yaz/z-proto.h b/include/yaz/z-proto.h index b6576b1..0c255c7 100644 --- a/include/yaz/z-proto.h +++ b/include/yaz/z-proto.h @@ -1,10 +1,22 @@ /* - * Copyright (c) 1998-1999, Index Data + * Copyright (c) 1998-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: z-proto.h,v $ - * Revision 1.2 1999-12-16 23:36:19 adam + * Revision 1.6 2001-09-19 10:19:07 adam + * Z_SortCase_caseInsensitive was set to wrong value. + * + * Revision 1.5 2001/05/17 14:16:15 adam + * Added EXTERNAL handling for item update0 (1.0). + * + * Revision 1.4 2000/03/14 09:19:49 ian + * Added admin extended service encoders & decoders. + * + * Revision 1.3 2000/02/28 11:20:06 adam + * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. + * + * Revision 1.2 1999/12/16 23:36:19 adam * Implemented ILL protocol. Minor updates ASN.1 compiler. * * Revision 1.1 1999/11/30 13:47:11 adam @@ -52,12 +64,12 @@ #include #include #include +#include #include #include +#include -#ifdef __cplusplus -extern "C" { -#endif +YAZ_BEGIN_CDECL #define Z_PRES_SUCCESS Z_PresentStatus_success #define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1 @@ -80,7 +92,7 @@ extern "C" { #define Z_SortRelation_descendingByFreq Z_SortKeySpec_descendingByfrequency #define Z_SortCase_caseSensitive Z_SortKeySpec_caseSensitive -#define Z_SortCase_caseInsensitive Z_SortKeySpec_descendingByfrequency +#define Z_SortCase_caseInsensitive Z_SortKeySpec_caseInsensitive #define Z_TriggerResourceCtrl_resourceReport Z_TriggerResourceControlRequest_resourceReport #define Z_TriggerResourceCtrl_resourceControl Z_TriggerResourceControlRequest_resourceControl @@ -115,9 +127,7 @@ typedef struct Z_IOItemOrder Z_ItemOrder; YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which); YAZ_EXPORT Z_Close *zget_Close (ODR o); -#ifdef __cplusplus -} -#endif +YAZ_END_CDECL #include