Merge branch 'Win32' of ssh://github.psi.ch:7999/ed/require into Win32

Conflicts:
	Makefile

GNUmakefile

@@ -2,11 +2,6 @@ include /ioc/tools/driver.makefile
 
 BUILDCLASSES += Linux
 
-# I need to find the Linux link.h before the EPICS link.h
-USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include 
-
-USR_CFLAGS += -DT_A=${T_A}
-
 SOURCES += require.c
 DBDS    += require.dbd
 
@@ -14,3 +9,9 @@ DBDS    += require.dbd
 
 SOURCES_vxWorks += strdup.c asprintf.c
 HEADERS += strdup.h asprintf.h
+
+# We need to find the Linux link.h before the EPICS link.h
+USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include 
+
+# Pass T_A to the code
+USR_CFLAGS += -DT_A=${T_A}

Makefile

@@ -3,7 +3,7 @@ TOP=..
 include $(TOP)/configure/CONFIG
 
 # library
-LIBRARY = require
+LOADABLE_LIBRARY = require
 LIB_SRCS += require_registerRecordDeviceDriver.cpp
 
 #require_DBD += base.dbd
@@ -11,7 +11,7 @@ LIB_SRCS += require_registerRecordDeviceDriver.cpp
 LIB_SRCS += require.c
 LIB_SRCS_vxWorks = asprintf.c strdup.c
 
-require_DBD += $(LIBRARY).dbd
+require_DBD += require.dbd
 
 LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
 
@@ -20,5 +20,6 @@ USR_INCLUDES_Linux=-idirafter ${EPICS_BASE}/include
 
 # Pass T_A to the code
 USR_CFLAGS += -DT_A=${T_A}
+USR_CFLAGS_WIN32 += -D_WIN32_WINNT=0x501
 
 include $(TOP)/configure/RULES

require.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
+
 #include <errno.h>
 
 #include <macLib.h>
@@ -116,6 +116,7 @@ int requireDebug=0;
         #endif
     #endif
 
+    #include <unistd.h>
     #include <dlfcn.h>
     #define HMODULE void *