/* System includes */
-#ifdef _VMS_
+#ifndef _VMS_
-#elif WINDOWS
+#ifdef WINDOWS
#ifdef YNETINCLUDE
#include <winsock.h>
#endif
-#else
-/*
- * Standard Unix headers
- */
-
+#else /* #ifdef WINDOWS */
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/select.h>
#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
#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