#ifndef YCONFIG_H
#define YCONFIG_H
-/* System includes */
-
-#ifndef _VMS_
-
-#ifdef WIN32
-
-#ifdef YNETINCLUDE
-#include <winsock.h>
-#endif
-
-#else /* #ifdef WIN32 */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#ifdef YNETINCLUDE
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#endif
-
-#ifdef _AIX
-#include <sys/select.h>
-#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
+#if HAVE_CONFIG_H
+#include <yaz/config.h>
#endif
+#ifndef YAZ_EXPORT
+# ifdef WIN32
+# define YAZ_EXPORT __declspec(dllexport)
+# else
+# define YAZ_EXPORT
+# endif
#endif
-#endif /* ifndef _VMS_ */
-#ifndef YAZ_EXPORT
-#ifdef WIN32
-#define YAZ_EXPORT __declspec(dllexport)
+#ifdef __cplusplus
+#define YAZ_BEGIN_CDECL extern "C" {
+#define YAZ_END_CDECL }
#else
-#define YAZ_EXPORT
-#endif
+#define YAZ_BEGIN_CDECL
+#define YAZ_END_CDECL
#endif
#endif