projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
YAZ version 1.4pl1.
[yaz-moved-to-github.git]
/
include
/
prt-esp.h
diff --git
a/include/prt-esp.h
b/include/prt-esp.h
index
ce0f3b8
..
3459ffb
100644
(file)
--- a/
include/prt-esp.h
+++ b/
include/prt-esp.h
@@
-30,6
+30,10
@@
#include <yconfig.h>
#include <yconfig.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct Z_OccurValues
{
int *start;
typedef struct Z_OccurValues
{
int *start;
@@
-38,12
+42,10
@@
typedef struct Z_OccurValues
typedef struct Z_Occurrences
{
typedef struct Z_Occurrences
{
- enum
- {
- Z_Occurrences_all,
- Z_Occurrences_last,
- Z_Occurrences_values
- } which;
+ int which;
+#define Z_Occurrences_all 0
+#define Z_Occurrences_last 1
+#define Z_Occurrences_values 2
union
{
Odr_null *all;
union
{
Odr_null *all;
@@
-61,12
+63,10
@@
typedef struct Z_SpecificTag
typedef struct Z_ETagUnit
{
typedef struct Z_ETagUnit
{
- enum
- {
- Z_ETagUnit_specificTag,
- Z_ETagUnit_wildThing,
- Z_ETagUnit_wildPath
- } which;
+ int which;
+#define Z_ETagUnit_specificTag 0
+#define Z_ETagUnit_wildThing 1
+#define Z_ETagUnit_wildPath 2
union
{
Z_SpecificTag *specificTag;
union
{
Z_SpecificTag *specificTag;
@@
-101,11
+101,9
@@
typedef struct Z_CompoSpecs
typedef struct Z_CompositeElement
{
typedef struct Z_CompositeElement
{
- enum
- {
- Z_CompoElement_primitives,
- Z_CompoElement_specs
- } which;
+ int which;
+#define Z_CompoElement_primitives 0
+#define Z_CompoElement_specs 1
union
{
Z_CompoPrimitives *primitives;
union
{
Z_CompoPrimitives *primitives;
@@
-117,11
+115,9
@@
typedef struct Z_CompositeElement
typedef struct Z_ElementRequest
{
typedef struct Z_ElementRequest
{
- enum
- {
- Z_ERequest_simpleElement,
- Z_ERequest_compositeElement
- } which;
+ int which;
+#define Z_ERequest_simpleElement 0
+#define Z_ERequest_compositeElement 1
union
{
Z_SimpleElement *simpleElement;
union
{
Z_SimpleElement *simpleElement;
@@
-137,9
+133,13
@@
typedef struct Z_Espec1
Z_Variant *defaultVariantRequest; /* OPTIONAL */
int *defaultTagType; /* OPTIONAL */
int num_elements;
Z_Variant *defaultVariantRequest; /* OPTIONAL */
int *defaultTagType; /* OPTIONAL */
int num_elements;
- Z_ElementRequest *elements; /* OPTIONAL */
+ Z_ElementRequest **elements; /* OPTIONAL */
} Z_Espec1;
} Z_Espec1;
-int z_Espec1(ODR o, Z_Espec1 **p, int opt);
+YAZ_EXPORT int z_Espec1(ODR o, Z_Espec1 **p, int opt);
+
+#ifdef __cplusplus
+}
+#endif
#endif
#endif