From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 1 Sep 1997 08:49:47 +0000 (+0000)
Subject: New windows NT/95 port using MSV5.0. To export DLL functions the
X-Git-Tag: YAZ.1.8~632
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=46ed30d0d83dd1b21e58a4db365a60aefaa5aad8

New windows NT/95 port using MSV5.0. To export DLL functions the
YAZ_EXPORT modifier was added. Defined in yconfig.h.
---

diff --git a/include/backend.h b/include/backend.h
index 7d5dcef..dafafad 100644
--- a/include/backend.h
+++ b/include/backend.h
@@ -49,7 +49,7 @@ typedef struct bend_initresult
     void *handle;              /* private handle to the backend module */
 } bend_initresult;
 
-bend_initresult MDF *bend_init(bend_initrequest *r);   
+YAZ_EXPORT bend_initresult MDF *bend_init(bend_initrequest *r);   
 
 typedef struct bend_searchrequest
 {
@@ -67,8 +67,9 @@ typedef struct bend_searchresult
     char *errstring;           /* system error string or NULL */
 } bend_searchresult;
 
-bend_searchresult *bend_search(void *handle, bend_searchrequest *r, int *fd);
-bend_searchresult *bend_searchresponse(void *handle);
+YAZ_EXPORT bend_searchresult *bend_search(void *handle, bend_searchrequest *r,
+                                          int *fd);
+YAZ_EXPORT bend_searchresult *bend_searchresponse(void *handle);
 
 typedef struct bend_fetchrequest
 {
@@ -90,8 +91,9 @@ typedef struct bend_fetchresult
     char *errstring;           /* system error string or NULL */
 } bend_fetchresult;
 
-bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *r, int *fd);
-bend_fetchresult *bend_fetchresponse(void *handle);
+YAZ_EXPORT bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *r,
+                                        int *fd);
+YAZ_EXPORT bend_fetchresult *bend_fetchresponse(void *handle);
 
 typedef struct bend_scanrequest
 {
@@ -121,8 +123,9 @@ typedef struct bend_scanresult
     char *errstring;
 } bend_scanresult;
 
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *r, int *fd);
-bend_scanresult *bend_scanresponse(void *handle);
+YAZ_EXPORT bend_scanresult *bend_scan(void *handle, bend_scanrequest *r,
+                                      int *fd);
+YAZ_EXPORT bend_scanresult *bend_scanresponse(void *handle);
 
 typedef struct bend_deleterequest
 {
@@ -135,10 +138,11 @@ typedef struct bend_deleteresult
     char *errstring;           /* system error string or NULL */
 } bend_deleteresult;
 
-bend_deleteresult *bend_delete(void *handle, bend_deleterequest *r, int *fd);
-bend_deleteresult *bend_deleteresponse(void *handle);
+YAZ_EXPORT bend_deleteresult *bend_delete(void *handle,
+                                          bend_deleterequest *r, int *fd);
+YAZ_EXPORT bend_deleteresult *bend_deleteresponse(void *handle);
 
-void bend_close(void *handle);
+YAZ_EXPORT void bend_close(void *handle);
 
 #ifdef __cplusplus
 }
diff --git a/include/ccl.h b/include/ccl.h
index f5921a4..b8ceeb1 100644
--- a/include/ccl.h
+++ b/include/ccl.h
@@ -46,7 +46,11 @@
  * CCL - header file
  *
  * $Log: ccl.h,v $
- * Revision 1.6  1997-05-14 06:53:37  adam
+ * Revision 1.7  1997-09-01 08:49:47  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.6  1997/05/14 06:53:37  adam
  * C++ support.
  *
  * Revision 1.5  1997/04/30 08:52:08  quinn
@@ -199,7 +203,7 @@ typedef struct ccl_qualifiers *CCL_bibset;
 /* CCL token */
 struct ccl_token {
     char kind;
-    char len;
+    size_t len;
     const char *name;
     struct ccl_token *next;
     struct ccl_token *prev;
@@ -271,7 +275,8 @@ int ccl_stricmp (const char *s1, const char *s2);
 int ccl_memicmp (const char *s1, const char *s2, size_t n);
 
 /* Search for qualifier 'name' in set 'b'. */
-struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name, int len);
+struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name,
+                                      size_t len);
 
 #ifdef __cplusplus
 }
diff --git a/include/comstack.h b/include/comstack.h
index ee8ebd7..ef2c1dd 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.16  1997-05-14 06:53:37  adam
+ * Revision 1.17  1997-09-01 08:49:47  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.16  1997/05/14 06:53:37  adam
  * C++ support.
  *
  * Revision 1.15  1996/07/06 19:58:32  quinn
@@ -188,8 +192,8 @@ struct comstack
 #define cs_getproto(handle) ((handle)->protocol)
 #define cs_addrstr(handle) ((*(handle)->f_addrstr)(handle))
 
-const char *cs_strerror(COMSTACK h);
-const char *cs_errmsg(int n);
+YAZ_EXPORT const char *cs_strerror(COMSTACK h);
+YAZ_EXPORT const char *cs_errmsg(int n);
 
 /*
  * error management.
@@ -201,7 +205,7 @@ const char *cs_errmsg(int n);
 #define CSNODATA   3
 #define CSWRONGBUF 4
 
-extern char *cs_errlist[];
+extern const char *cs_errlist[];
 
 /* backwards compatibility */
 #define CS_SR     PROTO_SR
diff --git a/include/d1_attset.h b/include/d1_attset.h
index c9d8e73..6989b82 100644
--- a/include/d1_attset.h
+++ b/include/d1_attset.h
@@ -70,8 +70,8 @@ typedef struct data1_attset
     struct data1_attset *next;       /* sibling */
 } data1_attset;
 
-data1_att *data1_getattbyname(data1_attset *s, char *name);
-data1_attset *data1_read_attset(char *file);
+YAZ_EXPORT data1_att *data1_getattbyname(data1_attset *s, char *name);
+YAZ_EXPORT data1_attset *data1_read_attset(char *file);
 
 #ifdef __cplusplus
 }
diff --git a/include/data1.h b/include/data1.h
index e1b3aef..480f437 100644
--- a/include/data1.h
+++ b/include/data1.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.21  1997-05-14 06:53:38  adam
+ * Revision 1.22  1997-09-01 08:49:48  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.21  1997/05/14 06:53:38  adam
  * C++ support.
  *
  * Revision 1.20  1996/10/29 13:34:39  adam
@@ -378,42 +382,42 @@ typedef struct data1_node
     struct data1_node *root;
 } data1_node;
 
-data1_node *get_parent_tag(data1_node *n);
-data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
+YAZ_EXPORT data1_node *get_parent_tag(data1_node *n);
+YAZ_EXPORT data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
     data1_absyn *absyn, NMEM m);
-data1_node *data1_read_record(int (*rf)(void *, char *, size_t),
+YAZ_EXPORT data1_node *data1_read_record(int (*rf)(void *, char *, size_t),
     void *fh, NMEM m);
-data1_absyn *data1_read_absyn(char *file);
-data1_tag *data1_gettagbynum(data1_tagset *s, int type, int value);
-data1_tagset *data1_read_tagset(char *file);
-data1_element *data1_getelementbytagname(data1_absyn *abs,
+YAZ_EXPORT data1_absyn *data1_read_absyn(char *file);
+YAZ_EXPORT data1_tag *data1_gettagbynum(data1_tagset *s, int type, int value);
+YAZ_EXPORT data1_tagset *data1_read_tagset(char *file);
+YAZ_EXPORT data1_element *data1_getelementbytagname(data1_absyn *abs,
     data1_element *parent, char *tagname);
-Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o, int *len);
-int data1_matchstr(char *s1, char *s2);
-data1_tag *data1_gettagbyname(data1_tagset *s, char *name);
-void data1_free_tree(data1_node *t);
-char *data1_nodetobuf(data1_node *n, int select, int *len);
-data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
+YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o, int *len);
+YAZ_EXPORT int data1_matchstr(char *s1, char *s2);
+YAZ_EXPORT data1_tag *data1_gettagbyname(data1_tagset *s, char *name);
+YAZ_EXPORT void data1_free_tree(data1_node *t);
+YAZ_EXPORT char *data1_nodetobuf(data1_node *n, int select, int *len);
+YAZ_EXPORT data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
     char *tagname, NMEM m);
-data1_datatype data1_maptype(char *t);
-data1_varset *data1_read_varset(char *file);
-data1_vartype *data1_getvartypebyct(data1_varset *set, char *zclass, char *type);
-Z_Espec1 *data1_read_espec1(char *file, ODR o);
-int data1_doespec1(data1_node *n, Z_Espec1 *e);
-data1_esetname *data1_getesetbyname(data1_absyn *a, char *name);
-data1_element *data1_getelementbyname(data1_absyn *absyn, char *name);
-data1_node *data1_mk_node(NMEM m);
-data1_absyn *data1_get_absyn(char *name);
-data1_maptab *data1_read_maptab(char *file);
-data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m);
-data1_marctab *data1_read_marctab(char *file);
-char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len);
-char *data1_nodetoidsgml(data1_node *n, int select, int *len);
-Z_ExplainRecord *data1_nodetoexplain(data1_node *n, int select, ODR o);
-Z_BriefBib *data1_nodetosummary(data1_node *n, int select, ODR o);
-char *data1_nodetosoif(data1_node *n, int select, int *len);
-void data1_set_tabpath(const char *path);
-const char *data1_get_tabpath(void);
+YAZ_EXPORT data1_datatype data1_maptype(char *t);
+YAZ_EXPORT data1_varset *data1_read_varset(char *file);
+YAZ_EXPORT data1_vartype *data1_getvartypebyct(data1_varset *set, char *zclass, char *type);
+YAZ_EXPORT Z_Espec1 *data1_read_espec1(char *file, ODR o);
+YAZ_EXPORT int data1_doespec1(data1_node *n, Z_Espec1 *e);
+YAZ_EXPORT data1_esetname *data1_getesetbyname(data1_absyn *a, char *name);
+YAZ_EXPORT data1_element *data1_getelementbyname(data1_absyn *absyn, char *name);
+YAZ_EXPORT data1_node *data1_mk_node(NMEM m);
+YAZ_EXPORT data1_absyn *data1_get_absyn(char *name);
+YAZ_EXPORT data1_maptab *data1_read_maptab(char *file);
+YAZ_EXPORT data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m);
+YAZ_EXPORT data1_marctab *data1_read_marctab(char *file);
+YAZ_EXPORT char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len);
+YAZ_EXPORT char *data1_nodetoidsgml(data1_node *n, int select, int *len);
+YAZ_EXPORT Z_ExplainRecord *data1_nodetoexplain(data1_node *n, int select, ODR o);
+YAZ_EXPORT Z_BriefBib *data1_nodetosummary(data1_node *n, int select, ODR o);
+YAZ_EXPORT char *data1_nodetosoif(data1_node *n, int select, int *len);
+YAZ_EXPORT void data1_set_tabpath(const char *path);
+YAZ_EXPORT const char *data1_get_tabpath(void);
 
 #ifdef __cplusplus
 }
diff --git a/include/diagbib1.h b/include/diagbib1.h
index 752c0c7..b2d5fe0 100644
--- a/include/diagbib1.h
+++ b/include/diagbib1.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: diagbib1.h,v $
- * Revision 1.5  1997-05-14 06:53:39  adam
+ * Revision 1.6  1997-09-01 08:49:48  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.5  1997/05/14 06:53:39  adam
  * C++ support.
  *
  * Revision 1.4  1995/09/29 17:12:02  quinn
@@ -53,7 +57,7 @@
 extern "C" {
 #endif
 
-const char *diagbib1_str (int code);
+YAZ_EXPORT const char *diagbib1_str (int code);
 
 #ifdef __cplusplus
 }
diff --git a/include/log.h b/include/log.h
index 3208599..0c7b85a 100644
--- a/include/log.h
+++ b/include/log.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: log.h,v $
- * Revision 1.10  1997-05-14 06:53:40  adam
+ * Revision 1.11  1997-09-01 08:49:48  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.10  1997/05/14 06:53:40  adam
  * C++ support.
  *
  * Revision 1.9  1997/05/01 15:06:42  adam
@@ -89,15 +93,15 @@ extern "C" {
 
 #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
 
-void log_init(int level, const char *prefix, const char *name);
-void logf(int level, const char *fmt, ...);
-int log_mask_str (const char *str);
-int log_mask_str_x (const char *str, int level);
-FILE *log_file(void);
+YAZ_EXPORT void log_init(int level, const char *prefix, const char *name);
+YAZ_EXPORT void logf(int level, const char *fmt, ...);
+YAZ_EXPORT int log_mask_str (const char *str);
+YAZ_EXPORT int log_mask_str_x (const char *str, int level);
+YAZ_EXPORT FILE *log_file(void);
 
-void log_event_start (void (*func)(int level, const char *msg, void *info),
+YAZ_EXPORT void log_event_start (void (*func)(int level, const char *msg, void *info),
 	void *info);
-void log_event_end (void (*func)(int level, const char *msg, void *info),
+YAZ_EXPORT void log_event_end (void (*func)(int level, const char *msg, void *info),
 	void *info);
 
 #ifdef __cplusplus
diff --git a/include/marcdisp.h b/include/marcdisp.h
index 01c0601..1549805 100644
--- a/include/marcdisp.h
+++ b/include/marcdisp.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: marcdisp.h,v $
- * Revision 1.5  1997-05-14 06:53:40  adam
+ * Revision 1.6  1997-09-01 08:49:49  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.5  1997/05/14 06:53:40  adam
  * C++ support.
  *
  * Revision 1.4  1995/09/29 17:12:03  quinn
@@ -50,7 +54,7 @@
 extern "C" {
 #endif
 
-int marc_display (const char *buf, FILE *outf);
+YAZ_EXPORT int marc_display (const char *buf, FILE *outf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nmem.h b/include/nmem.h
index 5d46548..601770b 100644
--- a/include/nmem.h
+++ b/include/nmem.h
@@ -28,7 +28,7 @@
 
 #ifndef NMEM_H
 #define NMEM_H
-
+#include <yconfig.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -50,11 +50,11 @@ typedef struct nmem_control
 
 typedef struct nmem_control *NMEM;
 
-void nmem_reset(NMEM n);
-void *nmem_malloc(NMEM n, int size);
-int nmem_total(NMEM n);
-NMEM nmem_create(void);
-void nmem_destroy(NMEM n);
+YAZ_EXPORT void nmem_reset(NMEM n);
+YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
+YAZ_EXPORT int nmem_total(NMEM n);
+YAZ_EXPORT NMEM nmem_create(void);
+YAZ_EXPORT void nmem_destroy(NMEM n);
 
 #ifdef __cplusplus
 }
diff --git a/include/odr.h b/include/odr.h
index 7e86126..f74c276 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.22  1997-07-21 12:44:30  adam
+ * Revision 1.23  1997-09-01 08:49:49  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.22  1997/07/21 12:44:30  adam
  * Moved definitions of nmem_block and nmem_control.
  *
  * Revision 1.21  1997/05/14 06:53:41  adam
@@ -245,6 +249,12 @@ typedef struct odr_ecblock
     int size;             /* current buffer size */
 } odr_ecblock;
 
+typedef struct {      /* used to be statics in ber_tag... */
+    int lclass;
+    int ltag;
+    int br;
+    int lcons;
+} Odr_ber_tag;
 
 typedef struct odr
 {
@@ -274,6 +284,8 @@ typedef struct odr
 #define ODR_MAX_STACK 50
     int stackp;          /* top of stack (-1 == initial state) */
     odr_constack stack[ODR_MAX_STACK];
+
+    Odr_ber_tag odr_ber_tag;
 } *ODR;
 
 typedef int (*Odr_fun)();
@@ -305,16 +317,16 @@ typedef struct odr_arm
 
 extern char *odr_errlist[];
 
-int odr_geterror(ODR o);
-void odr_perror(ODR o, char *message);
-void odr_setprint(ODR o, FILE *file);
-ODR odr_createmem(int direction);
-void odr_reset(ODR o);
-void odr_destroy(ODR o);
-void odr_setbuf(ODR o, char *buf, int len, int can_grow);
-char *odr_getbuf(ODR o, int *len, int *size);
-void *odr_malloc(ODR o, int size);
-NMEM odr_extract_mem(ODR o);
+YAZ_EXPORT int odr_geterror(ODR o);
+YAZ_EXPORT void odr_perror(ODR o, char *message);
+YAZ_EXPORT void odr_setprint(ODR o, FILE *file);
+YAZ_EXPORT ODR odr_createmem(int direction);
+YAZ_EXPORT void odr_reset(ODR o);
+YAZ_EXPORT void odr_destroy(ODR o);
+YAZ_EXPORT void odr_setbuf(ODR o, char *buf, int len, int can_grow);
+YAZ_EXPORT char *odr_getbuf(ODR o, int *len, int *size);
+YAZ_EXPORT void *odr_malloc(ODR o, int size);
+YAZ_EXPORT NMEM odr_extract_mem(ODR o);
 #define odr_release_mem(m) nmem_destroy(m)
 #define ODR_MEM NMEM
 
diff --git a/include/odr_use.h b/include/odr_use.h
index e7b2ea0..26166cb 100644
--- a/include/odr_use.h
+++ b/include/odr_use.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr_use.h,v $
- * Revision 1.7  1997-05-14 06:53:42  adam
+ * Revision 1.8  1997-09-01 08:49:49  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/05/14 06:53:42  adam
  * C++ support.
  *
  * Revision 1.6  1995/09/29 17:12:04  quinn
@@ -79,11 +83,11 @@ typedef struct Odr_external
     } u;
 } Odr_external;
 
-int odr_external(ODR o, Odr_external **p, int opt);
+YAZ_EXPORT int odr_external(ODR o, Odr_external **p, int opt);
 
-int odr_visiblestring(ODR o, char **p, int opt);
-int odr_graphicstring(ODR o, char **p, int opt);
-int odr_generalizedtime(ODR o, char **p, int opt);
+YAZ_EXPORT int odr_visiblestring(ODR o, char **p, int opt);
+YAZ_EXPORT int odr_graphicstring(ODR o, char **p, int opt);
+YAZ_EXPORT int odr_generalizedtime(ODR o, char **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/oid.h b/include/oid.h
index 7a035ce..f1357db 100644
--- a/include/oid.h
+++ b/include/oid.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: oid.h,v $
- * Revision 1.22  1997-08-19 08:45:13  quinn
+ * Revision 1.23  1997-09-01 08:49:50  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.22  1997/08/19 08:45:13  quinn
  * Added Thesaurus
  *
  * Revision 1.21  1997/08/19 08:43:49  quinn
@@ -203,14 +207,14 @@ typedef struct oident
     char *desc;
 } oident;
 
-int *oid_getoidbyent(struct oident *ent);
-struct oident *oid_getentbyoid(int *o);
-void oid_oidcpy(int *t, int *s);
-void oid_oidcat(int *t, int *s);
-int oid_oidcmp(int *o1, int *o2);
-int oid_oidlen(int *o);
-oid_value oid_getvalbyname(const char *name);
-void oid_setprivateoids(oident *list);
+YAZ_EXPORT int *oid_getoidbyent(struct oident *ent);
+YAZ_EXPORT struct oident *oid_getentbyoid(int *o);
+YAZ_EXPORT void oid_oidcpy(int *t, int *s);
+YAZ_EXPORT void oid_oidcat(int *t, int *s);
+YAZ_EXPORT int oid_oidcmp(int *o1, int *o2);
+YAZ_EXPORT int oid_oidlen(int *o);
+YAZ_EXPORT oid_value oid_getvalbyname(const char *name);
+YAZ_EXPORT void oid_setprivateoids(oident *list);
 
 #ifdef __cplusplus
 }
diff --git a/include/options.h b/include/options.h
index 8a360f9..49bf66a 100644
--- a/include/options.h
+++ b/include/options.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: options.h,v $
- * Revision 1.5  1997-05-14 06:53:43  adam
+ * Revision 1.6  1997-09-01 08:49:50  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.5  1997/05/14 06:53:43  adam
  * C++ support.
  *
  * Revision 1.4  1995/09/29 17:12:05  quinn
@@ -59,7 +63,7 @@
 extern "C" {
 #endif
 
-int options (const char *desc, char **argv, int argc, char **arg);
+YAZ_EXPORT int options (const char *desc, char **argv, int argc, char **arg);
 
 #ifdef __cplusplus
 }
diff --git a/include/pquery.h b/include/pquery.h
index b8ff386..c532f21 100644
--- a/include/pquery.h
+++ b/include/pquery.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: pquery.h,v $
- * Revision 1.7  1997-05-14 06:53:43  adam
+ * Revision 1.8  1997-09-01 08:49:50  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/05/14 06:53:43  adam
  * C++ support.
  *
  * Revision 1.6  1996/08/12 14:09:24  adam
@@ -58,11 +62,11 @@
 extern "C" {
 #endif
 
-Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf);
+YAZ_EXPORT Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf);
 
-Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
-                                    Odr_oid **attributeSetP, const char *qbuf);
-int p_query_attset (const char *arg);
+YAZ_EXPORT Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
+           Odr_oid **attributeSetP, const char *qbuf);
+YAZ_EXPORT int p_query_attset (const char *arg);
 
 #ifdef __cplusplus
 }
diff --git a/include/proto.h b/include/proto.h
index 59f0dc1..11e6c93 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.39  1997-05-14 06:53:44  adam
+ * Revision 1.40  1997-09-01 08:49:50  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.39  1997/05/14 06:53:44  adam
  * C++ support.
  *
  * Revision 1.38  1997/04/30 08:52:09  quinn
@@ -1327,40 +1331,40 @@ typedef struct Z_APDU
     } u;
 } Z_APDU;
 
-int z_APDU(ODR o, Z_APDU **p, int opt);
-int z_SUTRS(ODR o, Odr_oct **p, int opt);
-
-Z_InitRequest *zget_InitRequest(ODR o);
-Z_InitResponse *zget_InitResponse(ODR o);
-Z_SearchRequest *zget_SearchRequest(ODR o);
-Z_SearchResponse *zget_SearchResponse(ODR o);
-Z_PresentRequest *zget_PresentRequest(ODR o);
-Z_PresentResponse *zget_PresentResponse(ODR o);
-Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o);
-Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o);
-Z_ScanRequest *zget_ScanRequest(ODR o);
-Z_ScanResponse *zget_ScanResponse(ODR o);
-Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
-Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
-Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
-Z_Close *zget_Close(ODR o);
-int z_StringList(ODR o, Z_StringList **p, int opt);
-int z_InternationalString(ODR o, char **p, int opt);
-int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
-int z_ElementSetName(ODR o, char **p, int opt);
-int z_IntUnit(ODR o, Z_IntUnit **p, int opt);
-int z_Unit(ODR o, Z_Unit **p, int opt);
-int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt);
-int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt);
-int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt);
-int z_Term(ODR o, Z_Term **p, int opt);
-int z_Specification(ODR o, Z_Specification **p, int opt);
-int z_Permissions(ODR o, Z_Permissions **p, int opt);
-int z_DiagRec(ODR o, Z_DiagRec **p, int opt);
-int z_AttributeList(ODR o, Z_AttributeList **p, int opt);
-int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt);
-Z_APDU *zget_APDU(ODR o, int which);
-int z_Query(ODR o, Z_Query **p, int opt);
+YAZ_EXPORT int z_APDU(ODR o, Z_APDU **p, int opt);
+YAZ_EXPORT int z_SUTRS(ODR o, Odr_oct **p, int opt);
+
+YAZ_EXPORT Z_InitRequest *zget_InitRequest(ODR o);
+YAZ_EXPORT Z_InitResponse *zget_InitResponse(ODR o);
+YAZ_EXPORT Z_SearchRequest *zget_SearchRequest(ODR o);
+YAZ_EXPORT Z_SearchResponse *zget_SearchResponse(ODR o);
+YAZ_EXPORT Z_PresentRequest *zget_PresentRequest(ODR o);
+YAZ_EXPORT Z_PresentResponse *zget_PresentResponse(ODR o);
+YAZ_EXPORT Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o);
+YAZ_EXPORT Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o);
+YAZ_EXPORT Z_ScanRequest *zget_ScanRequest(ODR o);
+YAZ_EXPORT Z_ScanResponse *zget_ScanResponse(ODR o);
+YAZ_EXPORT Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
+YAZ_EXPORT Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
+YAZ_EXPORT Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
+YAZ_EXPORT Z_Close *zget_Close(ODR o);
+YAZ_EXPORT int z_StringList(ODR o, Z_StringList **p, int opt);
+YAZ_EXPORT int z_InternationalString(ODR o, char **p, int opt);
+YAZ_EXPORT int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
+YAZ_EXPORT int z_ElementSetName(ODR o, char **p, int opt);
+YAZ_EXPORT int z_IntUnit(ODR o, Z_IntUnit **p, int opt);
+YAZ_EXPORT int z_Unit(ODR o, Z_Unit **p, int opt);
+YAZ_EXPORT int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt);
+YAZ_EXPORT int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt);
+YAZ_EXPORT int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt);
+YAZ_EXPORT int z_Term(ODR o, Z_Term **p, int opt);
+YAZ_EXPORT int z_Specification(ODR o, Z_Specification **p, int opt);
+YAZ_EXPORT int z_Permissions(ODR o, Z_Permissions **p, int opt);
+YAZ_EXPORT int z_DiagRec(ODR o, Z_DiagRec **p, int opt);
+YAZ_EXPORT int z_AttributeList(ODR o, Z_AttributeList **p, int opt);
+YAZ_EXPORT int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt);
+YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which);
+YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-acc.h b/include/prt-acc.h
index 9dcd21c..ad8d82d 100644
--- a/include/prt-acc.h
+++ b/include/prt-acc.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: prt-acc.h,v $
- * Revision 1.7  1997-05-14 06:53:46  adam
+ * Revision 1.8  1997-09-01 08:49:51  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/05/14 06:53:46  adam
  * C++ support.
  *
  * Revision 1.6  1996/01/02 08:57:35  quinn
@@ -160,7 +164,7 @@ typedef struct Z_PromptObject1
     } u;
 } Z_PromptObject1;
 
-int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt);
+YAZ_EXPORT int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-arc.h b/include/prt-arc.h
index bf120b5..a537f71 100644
--- a/include/prt-arc.h
+++ b/include/prt-arc.h
@@ -127,8 +127,8 @@ typedef struct Z_OPACRecord
     Z_HoldingsRecord **holdingsData;   /* OPTIONAL */
 } Z_OPACRecord;
 
-int z_BriefBib(ODR o, Z_BriefBib **p, int opt);
-int z_OPACRecord(ODR o, Z_OPACRecord **p, int opt);
+YAZ_EXPORT int z_BriefBib(ODR o, Z_BriefBib **p, int opt);
+YAZ_EXPORT int z_OPACRecord(ODR o, Z_OPACRecord **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-dia.h b/include/prt-dia.h
index e971786..5e42355 100644
--- a/include/prt-dia.h
+++ b/include/prt-dia.h
@@ -326,7 +326,7 @@ typedef struct Z_DiagnosticFormat
     Z_DiagnosticUnit **diagnostics;
 } Z_DiagnosticFormat;
 
-int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt);
+YAZ_EXPORT int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-esp.h b/include/prt-esp.h
index 7e2ad53..3459ffb 100644
--- a/include/prt-esp.h
+++ b/include/prt-esp.h
@@ -136,7 +136,7 @@ typedef struct Z_Espec1
     Z_ElementRequest **elements;           /* OPTIONAL */
 } 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
 }
diff --git a/include/prt-exd.h b/include/prt-exd.h
index 48ea85d..47a1754 100644
--- a/include/prt-exd.h
+++ b/include/prt-exd.h
@@ -256,7 +256,7 @@ typedef struct Z_IUUpdate
     } u;
 } Z_IUUpdate;
 
-int z_IUUpdate(ODR o, Z_IUUpdate **p, int opt);
+YAZ_EXPORT int z_IUUpdate(ODR o, Z_IUUpdate **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-exp.h b/include/prt-exp.h
index 1b122d4..74afadd 100644
--- a/include/prt-exp.h
+++ b/include/prt-exp.h
@@ -999,7 +999,7 @@ typedef struct Z_ExplainRecord
     } u;
 } Z_ExplainRecord;
 
-int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+YAZ_EXPORT int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-ext.h b/include/prt-ext.h
index 30b2541..988f75e 100644
--- a/include/prt-ext.h
+++ b/include/prt-ext.h
@@ -99,8 +99,8 @@ struct Z_External
     } u;
 };
 
-int z_External(ODR o, Z_External **p, int opt);
-Z_ext_typeent *z_ext_getentbyref(oid_value val);
+YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt);
+YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(oid_value val);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt-grs.h b/include/prt-grs.h
index f65eccc..808ceae 100644
--- a/include/prt-grs.h
+++ b/include/prt-grs.h
@@ -174,8 +174,8 @@ struct Z_GenericRecord
     Z_TaggedElement **elements;
 };
 
-int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
-int z_Variant(ODR o, Z_Variant **p, int opt);
+YAZ_EXPORT int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
+YAZ_EXPORT int z_Variant(ODR o, Z_Variant **p, int opt);
 
 #ifdef __cplusplus
 }
diff --git a/include/prt.h b/include/prt.h
index 4c52abf..5e9ee28 100644
--- a/include/prt.h
+++ b/include/prt.h
@@ -7,57 +7,57 @@
 extern "C" {
 #endif
 
-int ber_boolean(ODR o, int *val);
-int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt);
-int ber_enctag(ODR o, int zclass, int tag, int constructed);
-int ber_dectag(unsigned char *buf, int *zclass, int *tag, int *constructed);
-int odr_bool(ODR o, int **p, int opt);
-int odr_integer(ODR o, int **p, int opt);
-int odr_implicit_settag(ODR o, int zclass, int tag);
+YAZ_EXPORT int ber_boolean(ODR o, int *val);
+YAZ_EXPORT int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt);
+YAZ_EXPORT int ber_enctag(ODR o, int zclass, int tag, int constructed);
+YAZ_EXPORT int ber_dectag(unsigned char *buf, int *zclass, int *tag, int *constructed);
+YAZ_EXPORT int odr_bool(ODR o, int **p, int opt);
+YAZ_EXPORT int odr_integer(ODR o, int **p, int opt);
+YAZ_EXPORT int odr_implicit_settag(ODR o, int zclass, int tag);
 #if 0
-int odr_implicit(ODR o, int (*type)(ODR o, void *p, int opt), void *p,
+YAZ_EXPORT int odr_implicit(ODR o, int (*type)(ODR o, void *p, int opt), void *p,
     int zclass, int tag, int opt);
 #endif
-int ber_enclen(ODR o, int len, int lenlen, int exact);
-int ber_declen(unsigned char *buf, int *len);
-char *odr_indent(ODR o);
-int ber_null(ODR o);
-int odr_null(ODR o, Odr_null **p, int opt);
-int ber_integer(ODR o, int *val);
-int odr_constructed_begin(ODR o, void *p, int zclass, int tag);
-int odr_constructed_end(ODR o);
-int odr_sequence_begin(ODR o, void *p, int size);
-int odr_sequence_end(ODR o);
-int ber_octetstring(ODR o, Odr_oct *p, int cons);
-int odr_octetstring(ODR o, Odr_oct **p, int opt);
-int odp_more_chunks(ODR o, unsigned char *base, int len);
-int odr_constructed_more(ODR o);
-int odr_bitstring(ODR o, Odr_bitmask **p, int opt);
-int ber_bitstring(ODR o, Odr_bitmask *p, int cons);
-int odr_generalstring(ODR o, char **p, int opt);
-int ber_oidc(ODR o, Odr_oid *p);
-int odr_oid(ODR o, Odr_oid **p, int opt);
-int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp);
-int odr_cstring(ODR o, char **p, int opt);
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num);
-int odr_any(ODR o, Odr_any **p, int opt);
-int ber_any(ODR o, Odr_any **p);
-int completeBER(unsigned char *buf, int len);
-void odr_begin(ODR o);
-void odr_end(ODR o);
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o);
-int odr_grow_block(odr_ecblock *b, int min_bytes);
-int odr_write(ODR o, unsigned char *buf, int bytes);
-int odr_seek(ODR o, int whence, int offset);
-int odr_dumpBER(FILE *f, char *buf, int len);
-void odr_choice_bias(ODR o, int what);
-void odr_choice_enable_bias(ODR o, int mode);
-int odr_total(ODR o);
-char *odr_errmsg(int n);
-Odr_oid *odr_getoidbystr(ODR o, char *str);
-int odr_initmember(ODR o, void *p, int size);
-int odr_peektag(ODR o, int *zclass, int *tag, int *cons);
-void odr_setlenlen(ODR o, int len);
+YAZ_EXPORT int ber_enclen(ODR o, int len, int lenlen, int exact);
+YAZ_EXPORT int ber_declen(unsigned char *buf, int *len);
+YAZ_EXPORT char *odr_indent(ODR o);
+YAZ_EXPORT int ber_null(ODR o);
+YAZ_EXPORT int odr_null(ODR o, Odr_null **p, int opt);
+YAZ_EXPORT int ber_integer(ODR o, int *val);
+YAZ_EXPORT int odr_constructed_begin(ODR o, void *p, int zclass, int tag);
+YAZ_EXPORT int odr_constructed_end(ODR o);
+YAZ_EXPORT int odr_sequence_begin(ODR o, void *p, int size);
+YAZ_EXPORT int odr_sequence_end(ODR o);
+YAZ_EXPORT int ber_octetstring(ODR o, Odr_oct *p, int cons);
+YAZ_EXPORT int odr_octetstring(ODR o, Odr_oct **p, int opt);
+YAZ_EXPORT int odp_more_chunks(ODR o, unsigned char *base, int len);
+YAZ_EXPORT int odr_constructed_more(ODR o);
+YAZ_EXPORT int odr_bitstring(ODR o, Odr_bitmask **p, int opt);
+YAZ_EXPORT int ber_bitstring(ODR o, Odr_bitmask *p, int cons);
+YAZ_EXPORT int odr_generalstring(ODR o, char **p, int opt);
+YAZ_EXPORT int ber_oidc(ODR o, Odr_oid *p);
+YAZ_EXPORT int odr_oid(ODR o, Odr_oid **p, int opt);
+YAZ_EXPORT int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp);
+YAZ_EXPORT int odr_cstring(ODR o, char **p, int opt);
+YAZ_EXPORT int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num);
+YAZ_EXPORT int odr_any(ODR o, Odr_any **p, int opt);
+YAZ_EXPORT int ber_any(ODR o, Odr_any **p);
+YAZ_EXPORT int completeBER(unsigned char *buf, int len);
+YAZ_EXPORT void odr_begin(ODR o);
+YAZ_EXPORT void odr_end(ODR o);
+YAZ_EXPORT Odr_oid *odr_oiddup(ODR odr, Odr_oid *o);
+YAZ_EXPORT int odr_grow_block(odr_ecblock *b, int min_bytes);
+YAZ_EXPORT int odr_write(ODR o, unsigned char *buf, int bytes);
+YAZ_EXPORT int odr_seek(ODR o, int whence, int offset);
+YAZ_EXPORT int odr_dumpBER(FILE *f, char *buf, int len);
+YAZ_EXPORT void odr_choice_bias(ODR o, int what);
+YAZ_EXPORT void odr_choice_enable_bias(ODR o, int mode);
+YAZ_EXPORT int odr_total(ODR o);
+YAZ_EXPORT char *odr_errmsg(int n);
+YAZ_EXPORT Odr_oid *odr_getoidbystr(ODR o, char *str);
+YAZ_EXPORT int odr_initmember(ODR o, void *p, int size);
+YAZ_EXPORT int odr_peektag(ODR o, int *zclass, int *tag, int *cons);
+YAZ_EXPORT void odr_setlenlen(ODR o, int len);
 
 #ifdef __cplusplus
 }
diff --git a/include/readconf.h b/include/readconf.h
index 7d76de1..d9ccd59 100644
--- a/include/readconf.h
+++ b/include/readconf.h
@@ -3,15 +3,16 @@
 #define READCONF_H
 
 #include <stdio.h>
+#include <yconfig.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int readconf(char *name, void *rprivate,
-int (*fun)(char *name, void *rprivate, int argc, char *argv[]));
+YAZ_EXPORT int readconf(char *name, void *rprivate,
+     int (*fun)(char *name, void *rprivate, int argc, char *argv[]));
 
-int readconf_line(FILE *f, char *line, int len, char *argv[], int num);
+YAZ_EXPORT int readconf_line(FILE *f, char *line, int len, char *argv[], int num);
 
 #ifdef __cplusplus
 }
diff --git a/include/statserv.h b/include/statserv.h
index 2276efd..47a093e 100644
--- a/include/statserv.h
+++ b/include/statserv.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: statserv.h,v $
- * Revision 1.8  1997-05-14 06:53:51  adam
+ * Revision 1.9  1997-09-01 08:49:53  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.8  1997/05/14 06:53:51  adam
  * C++ support.
  *
  * Revision 1.7  1995/09/29 17:12:12  quinn
@@ -50,6 +54,7 @@
 
 #include <yconfig.h>
 #include <oid.h>
+#include "eventl.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,8 +75,10 @@ typedef struct statserv_options_block
 } statserv_options_block;
 
 int statserv_main(int argc, char **argv);
+void statserv_closedown(void);
 statserv_options_block *statserv_getcontrol(void);
 void statserv_setcontrol(statserv_options_block *block);
+void statserv_remove(IOCHAN pIOChannel);
 
 #ifdef __cplusplus
 }
diff --git a/include/tcpip.h b/include/tcpip.h
index a39ccfc..3ebe2d5 100644
--- a/include/tcpip.h
+++ b/include/tcpip.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: tcpip.h,v $
- * Revision 1.8  1997-05-14 06:53:52  adam
+ * Revision 1.9  1997-09-01 08:49:54  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.8  1997/05/14 06:53:52  adam
  * C++ support.
  *
  * Revision 1.7  1996/07/06 19:58:32  quinn
@@ -70,9 +74,9 @@
 extern "C" {
 #endif
 
-struct sockaddr_in *tcpip_strtoaddr(const char *str);
+YAZ_EXPORT struct sockaddr_in *tcpip_strtoaddr(const char *str);
 
-COMSTACK tcpip_type(int s, int blocking, int protocol);
+YAZ_EXPORT COMSTACK tcpip_type(int s, int blocking, int protocol);
 
 #ifdef __cplusplus
 }
diff --git a/include/wrbuf.h b/include/wrbuf.h
index 4c011e3..7a686ac 100644
--- a/include/wrbuf.h
+++ b/include/wrbuf.h
@@ -28,7 +28,7 @@
 #ifndef WRBUF_H
 #define WRBUF_H
 
-#include <yconfig.h>
+#include <xmalloc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/xmalloc.h b/include/xmalloc.h
index 48d0fb8..a8ea211 100644
--- a/include/xmalloc.h
+++ b/include/xmalloc.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: xmalloc.h,v $
- * Revision 1.2  1997-05-14 06:53:53  adam
+ * Revision 1.3  1997-09-01 08:49:54  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.2  1997/05/14 06:53:53  adam
  * C++ support.
  *
  * Revision 1.1  1995/11/01 11:55:41  quinn
@@ -65,15 +69,17 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
+#include <yconfig.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void *xrealloc_f (void *o, size_t size, char *file, int line);
-void *xmalloc_f (size_t size, char *file, int line);
-void *xcalloc_f (size_t nmemb, size_t size, char *file, int line);
-char *xstrdup_f (const char *, char *file, int line);
-void xfree_f (void *p, char *file, int line);
+YAZ_EXPORT void *xrealloc_f (void *o, size_t size, char *file, int line);
+YAZ_EXPORT void *xmalloc_f (size_t size, char *file, int line);
+YAZ_EXPORT void *xcalloc_f (size_t nmemb, size_t size, char *file, int line);
+YAZ_EXPORT char *xstrdup_f (const char *, char *file, int line);
+YAZ_EXPORT void xfree_f (void *p, char *file, int line);
 
 #define xrealloc(o, x) xrealloc_f(o, x, __FILE__, __LINE__)
 #define xmalloc(x) xmalloc_f(x, __FILE__, __LINE__)
diff --git a/include/yaz-ccl.h b/include/yaz-ccl.h
index 084b55d..9da4c37 100644
--- a/include/yaz-ccl.h
+++ b/include/yaz-ccl.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: yaz-ccl.h,v $
- * Revision 1.7  1997-06-23 10:30:45  adam
+ * Revision 1.8  1997-09-01 08:49:54  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/06/23 10:30:45  adam
  * Added ODR stream as parameter to ccl_rpn_query and ccl_scan_query.
  *
  * Revision 1.6  1997/05/14 06:53:54  adam
@@ -54,8 +58,8 @@
 extern "C" {
 #endif
 
-Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p);
-Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p);
+YAZ_EXPORT Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p);
+YAZ_EXPORT Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p);
 
 #ifdef __cplusplus
 }
diff --git a/include/yaz-util.h b/include/yaz-util.h
index 5446824..9143460 100644
--- a/include/yaz-util.h
+++ b/include/yaz-util.h
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-util.h,v $
- * Revision 1.3  1997-05-14 06:53:54  adam
+ * Revision 1.4  1997-09-01 08:49:54  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.3  1997/05/14 06:53:54  adam
  * C++ support.
  *
  * Revision 1.2  1996/02/20 17:58:09  adam
@@ -19,11 +23,13 @@
 #ifndef YAZ_UTIL_H
 #define YAZ_UTIL_H
 
+#include <yconfig.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int yaz_matchstr(const char *s1, const char *s2);
+YAZ_EXPORT int yaz_matchstr(const char *s1, const char *s2);
 
 #ifdef __cplusplus
 }
diff --git a/include/yconfig.h b/include/yconfig.h
index 3fa446b..8d5540e 100644
--- a/include/yconfig.h
+++ b/include/yconfig.h
@@ -34,7 +34,13 @@
 #endif
 #endif /* ifndef _VMS_ */
 
-#include <xmalloc.h>
+#ifndef YAZ_EXPORT
+#ifdef WINDOWS
+#define YAZ_EXPORT __declspec(dllexport)
+#else
+#define YAZ_EXPORT
+#endif
+#endif
 
 #ifdef WINDOWS
 #define MDF