[ofw] [PATCH 2/2] uDAT/uDAPL v2 - (master branch) changes to sync common code base with WinOF 1.01

Arlin Davis arlin.r.davis at intel.com
Fri Dec 7 16:08:56 PST 2007


2/2 uDAPL changes.

  - add DAT_API to specify calling conventions (windows=__stdcall, linux= ) 
  - cleanup CR+LF's

Signed-off by: Arlin Davis <ardavis at ichips.intel.com>

diff --git a/dapl/common/dapl_cno_util.c b/dapl/common/dapl_cno_util.c
index 936224a..9de7add 100755
--- a/dapl/common/dapl_cno_util.c
+++ b/dapl/common/dapl_cno_util.c
@@ -266,11 +266,11 @@ dapl_internal_cno_trigger (
  *
  * DAPL Requirements Version 2.0, 6.3.2.x
  *
- * creates a CNO instance. Upon creation, there are no
- * Event Dispatchers feeding it. os_fd is a File Descriptor in Unix, 
- * i.e. struct pollfd or an equivalent object in other OSes that is 
- * always associates with the created CNO. Consumer can multiplex event 
- * waiting using UNIX poll or select functions. Upon creation, the CNO 
+ * creates a CNO instance. Upon creation, there are no
+ * Event Dispatchers feeding it. os_fd is a File Descriptor in Unix, 
+ * i.e. struct pollfd or an equivalent object in other OSes that is 
+ * always associates with the created CNO. Consumer can multiplex event 
+ * waiting using UNIX poll or select functions. Upon creation, the CNO 
  * is not associated with any EVDs, has no waiters and has the os_fd 
  * associated with it.
  *
@@ -292,7 +292,7 @@ dapl_internal_cno_trigger (
  *	DAT_PRIVILEGES_VIOLATION
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_cno_fd_create (
 	IN 	DAT_IA_HANDLE ia_handle,	/* ia_handle            */
 	OUT	DAT_FD *fd,			/* file_descriptor	*/
@@ -319,7 +319,7 @@ dapl_cno_fd_create (
  *	DAT_INVALID_HANDLE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_cno_trigger(
     IN  DAT_CNO_HANDLE	cno_handle,
     OUT DAT_EVD_HANDLE	*evd_handle)
diff --git a/dapl/common/dapl_cr_accept.c b/dapl/common/dapl_cr_accept.c
index c30c29e..a0ec14b 100644
--- a/dapl/common/dapl_cr_accept.c
+++ b/dapl/common/dapl_cr_accept.c
@@ -62,7 +62,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_INVALID_ATTRIBUTE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_cr_accept (
 	IN	DAT_CR_HANDLE		cr_handle,
 	IN	DAT_EP_HANDLE		ep_handle,
diff --git a/dapl/common/dapl_cr_handoff.c b/dapl/common/dapl_cr_handoff.c
index b34508f..1899360 100644
--- a/dapl/common/dapl_cr_handoff.c
+++ b/dapl/common/dapl_cr_handoff.c
@@ -58,7 +58,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_cr_handoff (
 	IN	DAT_CR_HANDLE	   cr_handle,
 	IN 	DAT_CONN_QUAL	   cr_handoff )		/* handoff */
diff --git a/dapl/common/dapl_cr_query.c b/dapl/common/dapl_cr_query.c
index 1b1101b..d458782 100644
--- a/dapl/common/dapl_cr_query.c
+++ b/dapl/common/dapl_cr_query.c
@@ -58,7 +58,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_cr_query (
 	IN	DAT_CR_HANDLE		cr_handle,
 	IN	DAT_CR_PARAM_MASK	cr_param_mask,
diff --git a/dapl/common/dapl_cr_reject.c b/dapl/common/dapl_cr_reject.c
index 31f7ed0..d6842b3 100755
--- a/dapl/common/dapl_cr_reject.c
+++ b/dapl/common/dapl_cr_reject.c
@@ -59,7 +59,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_cr_reject (
 	IN      DAT_CR_HANDLE cr_handle,/* cr_handle            */
 	IN	DAT_COUNT pdata_size,	/* private_data_size	*/
diff --git a/dapl/common/dapl_csp.c b/dapl/common/dapl_csp.c
index 6c0aaf2..678ca79 100755
--- a/dapl/common/dapl_csp.c
+++ b/dapl/common/dapl_csp.c
@@ -46,12 +46,12 @@
  *
  * uDAPL: User Direct Access Program Library Version 2.0, 6.4.4.2
  *
- * The Common Service Point is transport-independent analog of the Public
- * Service Point. It allows the Consumer to listen on socket-equivalent for
- * requests for connections arriving on a specified IP port instead of
+ * The Common Service Point is transport-independent analog of the Public
+ * Service Point. It allows the Consumer to listen on socket-equivalent for
+ * requests for connections arriving on a specified IP port instead of
  * transport-dependent Connection Qualifier. An IA Address follows the
- * platform conventions and provides among others the IP port to listen on.
- * An IP port of the Common Service Point advertisement is supported by
+ * platform conventions and provides among others the IP port to listen on.
+ * An IP port of the Common Service Point advertisement is supported by
  * existing Ethernet infrastructure or DAT Name Service.
  *
  * Input:
@@ -71,7 +71,7 @@
  * 	DAT_CONN_QUAL_IN_USE
  * 	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_csp_create (
 	IN      DAT_IA_HANDLE ia_handle,          /* ia_handle      */
 	IN      DAT_COMM *comm,                   /* communicator   */
@@ -82,7 +82,7 @@ dapl_csp_create (
 	return DAT_MODEL_NOT_SUPPORTED;
 }
 
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_csp_query (
 	IN      DAT_CSP_HANDLE csp_handle,         /* csp_handle     */
 	IN      DAT_CSP_PARAM_MASK param_mask,     /* csp_param_mask */
@@ -91,7 +91,7 @@ dapl_csp_query (
 	return DAT_MODEL_NOT_SUPPORTED;
 }
 
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_csp_free (
 	IN      DAT_CSP_HANDLE csp_handle )        /* csp_handle     */
 {
diff --git a/dapl/common/dapl_ep_connect.c b/dapl/common/dapl_ep_connect.c
index cf5b2c5..0998edc 100755
--- a/dapl/common/dapl_ep_connect.c
+++ b/dapl/common/dapl_ep_connect.c
@@ -66,7 +66,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_MODLE_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_connect (
 	IN	DAT_EP_HANDLE		ep_handle,
 	IN	DAT_IA_ADDRESS_PTR	remote_ia_address,
@@ -403,7 +403,7 @@ bail:
  *	DAT_INVALID_STATE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_ep_common_connect (
 	IN      DAT_EP_HANDLE ep,		/* ep_handle            */
 	IN      DAT_IA_ADDRESS_PTR remote_addr,	/* remote_ia_address    */
diff --git a/dapl/common/dapl_ep_create_with_srq.c b/dapl/common/dapl_ep_create_with_srq.c
index dd47b51..b62f53b 100644
--- a/dapl/common/dapl_ep_create_with_srq.c
+++ b/dapl/common/dapl_ep_create_with_srq.c
@@ -70,7 +70,7 @@
  *	DAT_INVALID_ATTRIBUTE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_create_with_srq (
 	IN	DAT_IA_HANDLE	   	ia_handle,
 	IN	DAT_PZ_HANDLE	   	pz_handle,
diff --git a/dapl/common/dapl_ep_disconnect.c b/dapl/common/dapl_ep_disconnect.c
index 37fbb41..4101ac2 100644
--- a/dapl/common/dapl_ep_disconnect.c
+++ b/dapl/common/dapl_ep_disconnect.c
@@ -62,7 +62,7 @@
  *	DAT_INSUFFICIENT_RESOURCES
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_disconnect (
 	IN	DAT_EP_HANDLE	   	ep_handle,
 	IN	DAT_CLOSE_FLAGS		disconnect_flags)
diff --git a/dapl/common/dapl_ep_dup_connect.c b/dapl/common/dapl_ep_dup_connect.c
index 4423c4f..d853ddd 100644
--- a/dapl/common/dapl_ep_dup_connect.c
+++ b/dapl/common/dapl_ep_dup_connect.c
@@ -69,7 +69,7 @@
  *	DAT_INVALID_STATE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_dup_connect (
 	IN	DAT_EP_HANDLE		ep_handle,
 	IN	DAT_EP_HANDLE		ep_dup_handle,
diff --git a/dapl/common/dapl_ep_free.c b/dapl/common/dapl_ep_free.c
index 3bf41ab..d0b25f1 100644
--- a/dapl/common/dapl_ep_free.c
+++ b/dapl/common/dapl_ep_free.c
@@ -61,7 +61,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_INVALID_STATE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_free (
 	IN	DAT_EP_HANDLE	   ep_handle)
 {
diff --git a/dapl/common/dapl_ep_get_status.c b/dapl/common/dapl_ep_get_status.c
index 49b4fef..d55b512 100644
--- a/dapl/common/dapl_ep_get_status.c
+++ b/dapl/common/dapl_ep_get_status.c
@@ -59,7 +59,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_get_status (
 	IN	DAT_EP_HANDLE	   ep_handle,
 	OUT	DAT_EP_STATE	   *ep_state,
diff --git a/dapl/common/dapl_ep_modify.c b/dapl/common/dapl_ep_modify.c
index f2628af..e006b1d 100644
--- a/dapl/common/dapl_ep_modify.c
+++ b/dapl/common/dapl_ep_modify.c
@@ -76,7 +76,7 @@ dapli_ep_modify_validate_parameters (
  *	DAT_INVALID_ATTRIBUTE
  *	DAT_INVALID_STATE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_modify (
 	IN	DAT_EP_HANDLE	   	ep_handle,
 	IN	DAT_EP_PARAM_MASK	ep_param_mask,
diff --git a/dapl/common/dapl_ep_post_rdma_read.c b/dapl/common/dapl_ep_post_rdma_read.c
index 7f2b6df..95a7e05 100644
--- a/dapl/common/dapl_ep_post_rdma_read.c
+++ b/dapl/common/dapl_ep_post_rdma_read.c
@@ -66,7 +66,7 @@
  * 	DAT_PROTECTION_VIOLATION
  * 	DAT_PRIVILEGES_VIOLATION
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_post_rdma_read (
 	IN	DAT_EP_HANDLE		ep_handle,
 	IN	DAT_COUNT		num_segments,
diff --git a/dapl/common/dapl_ep_post_rdma_read_to_rmr.c
b/dapl/common/dapl_ep_post_rdma_read_to_rmr.c
index 929186f..2b1210d 100755
--- a/dapl/common/dapl_ep_post_rdma_read_to_rmr.c
+++ b/dapl/common/dapl_ep_post_rdma_read_to_rmr.c
@@ -46,7 +46,7 @@
  *
  * DAPL Requirements Version xxx, 6.6.24
  *
- * Requests the transfer of all the data specified by the remote_buffer 
+ * Requests the transfer of all the data specified by the remote_buffer 
  * over the connection of the ep_handle Endpoint into the local_iov 
  * specified by the RMR segments.
  *
@@ -72,7 +72,7 @@
  *	DAT_PRIVILEGES_VIOLATION
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_post_rdma_read_to_rmr (
 	IN      DAT_EP_HANDLE ep_handle,	/* ep_handle            */
 	IN      const DAT_RMR_TRIPLET *local,	/* local_iov            */
diff --git a/dapl/common/dapl_ep_post_rdma_write.c b/dapl/common/dapl_ep_post_rdma_write.c
index 95a107a..6b9ae94 100644
--- a/dapl/common/dapl_ep_post_rdma_write.c
+++ b/dapl/common/dapl_ep_post_rdma_write.c
@@ -66,7 +66,7 @@
  *	DAT_PROTECTION_VIOLATION
  *	DAT_PRIVILEGES_VIOLATION
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_post_rdma_write (
 	IN	DAT_EP_HANDLE		ep_handle,
 	IN	DAT_COUNT		num_segments,
diff --git a/dapl/common/dapl_ep_post_recv.c b/dapl/common/dapl_ep_post_recv.c
index c9be9ec..2e52411 100644
--- a/dapl/common/dapl_ep_post_recv.c
+++ b/dapl/common/dapl_ep_post_recv.c
@@ -66,7 +66,7 @@
  * 	DAT_PROTECTION_VIOLATION
  * 	DAT_PROVILEGES_VIOLATION
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_post_recv (
 	IN	DAT_EP_HANDLE	   	ep_handle,
 	IN	DAT_COUNT	   	num_segments,
diff --git a/dapl/common/dapl_ep_post_send.c b/dapl/common/dapl_ep_post_send.c
index 8fcdfa9..c13a095 100644
--- a/dapl/common/dapl_ep_post_send.c
+++ b/dapl/common/dapl_ep_post_send.c
@@ -66,7 +66,7 @@
  *	DAT_PROTECTION_VIOLATION
  *	DAT_PRIVILEGES_VIOLATION
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_post_send (
 	IN	DAT_EP_HANDLE	   	ep_handle,
 	IN	DAT_COUNT	   	num_segments,
diff --git a/dapl/common/dapl_ep_post_send_invalidate.c b/dapl/common/dapl_ep_post_send_invalidate.c
index 5ce0808..68a3a51 100755
--- a/dapl/common/dapl_ep_post_send_invalidate.c
+++ b/dapl/common/dapl_ep_post_send_invalidate.c
@@ -46,7 +46,7 @@
  *
  * DAPL Requirements Version xxx, 6.6.21
  *
- * Requests a transfer of all the data from the local_iov over the connection
+ * Requests a transfer of all the data from the local_iov over the connection
  * of the ep_handle Endpoint to the remote side and invalidates the Remote 
  * Memory Region context.
  *
@@ -71,7 +71,7 @@
  *	DAT_PRIVILEGES_VIOLATION
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_ep_post_send_with_invalidate (
 	IN      DAT_EP_HANDLE ep_handle,      /* ep_handle            */
 	IN      DAT_COUNT num_segments,       /* num_segments         */
diff --git a/dapl/common/dapl_ep_query.c b/dapl/common/dapl_ep_query.c
index 7162c70..bfdef3c 100644
--- a/dapl/common/dapl_ep_query.c
+++ b/dapl/common/dapl_ep_query.c
@@ -58,7 +58,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_query (
 	IN	DAT_EP_HANDLE		ep_handle,
 	IN	DAT_EP_PARAM_MASK	ep_param_mask,
diff --git a/dapl/common/dapl_ep_recv_query.c b/dapl/common/dapl_ep_recv_query.c
index 9b0d9be..cec7917 100644
--- a/dapl/common/dapl_ep_recv_query.c
+++ b/dapl/common/dapl_ep_recv_query.c
@@ -58,7 +58,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_recv_query (
 	IN	DAT_EP_HANDLE	   ep_handle,
 	OUT	DAT_COUNT	   *nbufs_allocate,
diff --git a/dapl/common/dapl_ep_reset.c b/dapl/common/dapl_ep_reset.c
index e98b115..1c307a6 100644
--- a/dapl/common/dapl_ep_reset.c
+++ b/dapl/common/dapl_ep_reset.c
@@ -61,7 +61,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_INVALID_STATE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_reset (
 	IN	DAT_EP_HANDLE	   ep_handle)
 {
diff --git a/dapl/common/dapl_ep_set_watermark.c b/dapl/common/dapl_ep_set_watermark.c
index 1ea93d5..c4b75f8 100644
--- a/dapl/common/dapl_ep_set_watermark.c
+++ b/dapl/common/dapl_ep_set_watermark.c
@@ -59,7 +59,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ep_set_watermark (
 	IN	DAT_EP_HANDLE	   ep_handle,
 	IN	DAT_COUNT	   soft_high_watermark,
diff --git a/dapl/common/dapl_evd_dequeue.c b/dapl/common/dapl_evd_dequeue.c
index 1b75267..f6faeeb 100644
--- a/dapl/common/dapl_evd_dequeue.c
+++ b/dapl/common/dapl_evd_dequeue.c
@@ -62,7 +62,7 @@
  * 	DAT_QUEUE_EMPTY
  */
 
-DAT_RETURN dapl_evd_dequeue (
+DAT_RETURN DAT_API dapl_evd_dequeue (
     IN    DAT_EVD_HANDLE	evd_handle,
     OUT   DAT_EVENT		*event)
 
diff --git a/dapl/common/dapl_evd_free.c b/dapl/common/dapl_evd_free.c
index d737d49..407dbc8 100755
--- a/dapl/common/dapl_evd_free.c
+++ b/dapl/common/dapl_evd_free.c
@@ -59,7 +59,7 @@
  *     DAT_INVALID_HANDLE
  *     DAT_INVALID_STATE
  */
-DAT_RETURN dapl_evd_free (
+DAT_RETURN DAT_API dapl_evd_free (
     IN    DAT_EVD_HANDLE    evd_handle)
 
 {
diff --git a/dapl/common/dapl_evd_post_se.c b/dapl/common/dapl_evd_post_se.c
index d2449c3..d196a49 100644
--- a/dapl/common/dapl_evd_post_se.c
+++ b/dapl/common/dapl_evd_post_se.c
@@ -60,7 +60,7 @@
  */
 
 
-DAT_RETURN dapl_evd_post_se (
+DAT_RETURN DAT_API dapl_evd_post_se (
 	DAT_EVD_HANDLE		evd_handle,	
 	const DAT_EVENT		*event)
 
diff --git a/dapl/common/dapl_evd_resize.c b/dapl/common/dapl_evd_resize.c
index 1c17fa6..b906244 100644
--- a/dapl/common/dapl_evd_resize.c
+++ b/dapl/common/dapl_evd_resize.c
@@ -63,7 +63,7 @@
  * 	DAT_INVALID_STATE
  */
 
-DAT_RETURN dapl_evd_resize (
+DAT_RETURN DAT_API dapl_evd_resize (
 	IN	DAT_EVD_HANDLE	   evd_handle,
 	IN	DAT_COUNT	   evd_qlen )
 {
diff --git a/dapl/common/dapl_get_consumer_context.c b/dapl/common/dapl_get_consumer_context.c
index e937c27..142b57b 100644
--- a/dapl/common/dapl_get_consumer_context.c
+++ b/dapl/common/dapl_get_consumer_context.c
@@ -55,7 +55,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_get_consumer_context (
 	IN	DAT_HANDLE  dat_handle,
 	OUT	DAT_CONTEXT *context )
diff --git a/dapl/common/dapl_get_handle_type.c b/dapl/common/dapl_get_handle_type.c
index 063f081..156d758 100644
--- a/dapl/common/dapl_get_handle_type.c
+++ b/dapl/common/dapl_get_handle_type.c
@@ -56,7 +56,7 @@
  * 	DAT_INVALID_PARAMETER
  */
 
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_get_handle_type (
 	IN	DAT_HANDLE	   dat_handle,
 	OUT	DAT_HANDLE_TYPE	   *handle_type )
diff --git a/dapl/common/dapl_ia_close.c b/dapl/common/dapl_ia_close.c
index 3e1b44c..533fae8 100644
--- a/dapl/common/dapl_ia_close.c
+++ b/dapl/common/dapl_ia_close.c
@@ -57,7 +57,7 @@
  * 	DAT_INSUFFICIENT_RESOURCES
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ia_close (
 	IN	DAT_IA_HANDLE	ia_handle,
 	IN	DAT_CLOSE_FLAGS ia_flags)
diff --git a/dapl/common/dapl_ia_ha.c b/dapl/common/dapl_ia_ha.c
index b2aa140..05bb6d6 100755
--- a/dapl/common/dapl_ia_ha.c
+++ b/dapl/common/dapl_ia_ha.c
@@ -47,7 +47,7 @@
  *
  * DAPL Requirements Version xxx, 5.9
  *
- * Queries for provider HA support
+ * Queries for provider HA support
  *
  * Input:
  *	ia_handle
@@ -61,7 +61,7 @@
  *	DAT_MODEL_NOT_SUPPORTED
  */
 
-DAT_RETURN 
+DAT_RETURN DAT_API
 dapl_ia_ha (
 	IN	 DAT_IA_HANDLE ia_handle, /* ia_handle */
 	IN const DAT_NAME_PTR  provider,  /* provider  */
diff --git a/dapl/common/dapl_ia_open.c b/dapl/common/dapl_ia_open.c
index d3d0ed0..7ca5dba 100644
--- a/dapl/common/dapl_ia_open.c
+++ b/dapl/common/dapl_ia_open.c
@@ -86,7 +86,7 @@ void dapli_hca_cleanup (
  * 	DAT_INVALID_HANDLE
  * 	DAT_PROVIDER_NOT_FOUND	(returned by dat registry if necessary)
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ia_open (
 	IN	const DAT_NAME_PTR name,
 	IN	DAT_COUNT	   async_evd_qlen,
diff --git a/dapl/common/dapl_ia_query.c b/dapl/common/dapl_ia_query.c
index 484844c..7596daf 100755
--- a/dapl/common/dapl_ia_query.c
+++ b/dapl/common/dapl_ia_query.c
@@ -61,7 +61,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_ia_query (
 	IN	DAT_IA_HANDLE	   		ia_handle,
 	OUT	DAT_EVD_HANDLE     		*async_evd_handle,
diff --git a/dapl/common/dapl_init.h b/dapl/common/dapl_init.h
index d97f0f2..0c98541 100644
--- a/dapl/common/dapl_init.h
+++ b/dapl/common/dapl_init.h
@@ -39,12 +39,12 @@
 #ifndef _DAPL_INIT_H_
 #define _DAPL_INIT_H_
 
-extern void 
+extern void DAT_API
 DAT_PROVIDER_INIT_FUNC_NAME (
     IN const DAT_PROVIDER_INFO *,
     IN const char * );                      /* instance data */
 
-extern void 
+extern void DAT_API
 DAT_PROVIDER_FINI_FUNC_NAME (
     IN const DAT_PROVIDER_INFO * );
 
diff --git a/dapl/common/dapl_lmr_free.c b/dapl/common/dapl_lmr_free.c
index 369ad85..f4106b4 100644
--- a/dapl/common/dapl_lmr_free.c
+++ b/dapl/common/dapl_lmr_free.c
@@ -57,7 +57,7 @@
  * 	DAT_INVALID_STATE 
  */
 
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_lmr_free (
     IN	DAT_LMR_HANDLE  lmr_handle )
 {
diff --git a/dapl/common/dapl_lmr_query.c b/dapl/common/dapl_lmr_query.c
index 1b8a0bd..7fdc75c 100644
--- a/dapl/common/dapl_lmr_query.c
+++ b/dapl/common/dapl_lmr_query.c
@@ -54,7 +54,7 @@
  *      DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_lmr_query (
     IN	DAT_LMR_HANDLE		lmr_handle,
     IN	DAT_LMR_PARAM_MASK	lmr_param_mask,
diff --git a/dapl/common/dapl_lmr_sync_rdma_read.c b/dapl/common/dapl_lmr_sync_rdma_read.c
index 29489e1..3815afc 100644
--- a/dapl/common/dapl_lmr_sync_rdma_read.c
+++ b/dapl/common/dapl_lmr_sync_rdma_read.c
@@ -56,7 +56,7 @@
  * 	DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_lmr_sync_rdma_read (
     IN  DAT_IA_HANDLE		ia_handle,
     IN  const DAT_LMR_TRIPLET	*local_segments,
diff --git a/dapl/common/dapl_lmr_sync_rdma_write.c b/dapl/common/dapl_lmr_sync_rdma_write.c
index 7c2676b..b13b02a 100644
--- a/dapl/common/dapl_lmr_sync_rdma_write.c
+++ b/dapl/common/dapl_lmr_sync_rdma_write.c
@@ -56,7 +56,7 @@
  * 	DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_lmr_sync_rdma_write (
     IN  DAT_IA_HANDLE		ia_handle,
     IN  const DAT_LMR_TRIPLET	*local_segments,
diff --git a/dapl/common/dapl_provider.c b/dapl/common/dapl_provider.c
index 2fbc415..bb78b74 100755
--- a/dapl/common/dapl_provider.c
+++ b/dapl/common/dapl_provider.c
@@ -368,6 +368,7 @@ dapl_provider_list_insert (
     cur_node->name[len] = '\0';
     cur_node->data = g_dapl_provider_template;
     cur_node->data.device_name = cur_node->name;
+
     cur_node->next = next_node;
     cur_node->prev = prev_node;
 
diff --git a/dapl/common/dapl_psp_create.c b/dapl/common/dapl_psp_create.c
index 93f4108..9d2e945 100644
--- a/dapl/common/dapl_psp_create.c
+++ b/dapl/common/dapl_psp_create.c
@@ -67,7 +67,7 @@
  * 	DAT_CONN_QUAL_IN_USE
  * 	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_psp_create (
 	IN	DAT_IA_HANDLE	   ia_handle,
 	IN	DAT_CONN_QUAL	   conn_qual,
diff --git a/dapl/common/dapl_psp_create_any.c b/dapl/common/dapl_psp_create_any.c
index a2057f5..a2768fb 100644
--- a/dapl/common/dapl_psp_create_any.c
+++ b/dapl/common/dapl_psp_create_any.c
@@ -70,7 +70,7 @@
  * 	DAT_CONN_QUAL_IN_USE
  * 	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_psp_create_any (
 	IN	DAT_IA_HANDLE	   ia_handle,
 	OUT	DAT_CONN_QUAL	   *conn_qual,
diff --git a/dapl/common/dapl_psp_free.c b/dapl/common/dapl_psp_free.c
index 3b1042b..94256a8 100644
--- a/dapl/common/dapl_psp_free.c
+++ b/dapl/common/dapl_psp_free.c
@@ -58,7 +58,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_psp_free (
 	IN	DAT_PSP_HANDLE	   psp_handle )
 {
diff --git a/dapl/common/dapl_psp_query.c b/dapl/common/dapl_psp_query.c
index 0f4652d..4a55c8b 100644
--- a/dapl/common/dapl_psp_query.c
+++ b/dapl/common/dapl_psp_query.c
@@ -56,7 +56,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_psp_query (
 	IN	DAT_PSP_HANDLE	   	psp_handle,
 	IN	DAT_PSP_PARAM_MASK  	psp_args_mask,
diff --git a/dapl/common/dapl_pz_create.c b/dapl/common/dapl_pz_create.c
index 918f99a..a7105aa 100644
--- a/dapl/common/dapl_pz_create.c
+++ b/dapl/common/dapl_pz_create.c
@@ -55,7 +55,7 @@
  *      DAT_INVALID_PARAMETER
  *      DAT_INVLAID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_pz_create (
     IN	DAT_IA_HANDLE   ia_handle,
     OUT	DAT_PZ_HANDLE   *pz_handle)
diff --git a/dapl/common/dapl_pz_free.c b/dapl/common/dapl_pz_free.c
index 2d50fd3..b2510f7 100644
--- a/dapl/common/dapl_pz_free.c
+++ b/dapl/common/dapl_pz_free.c
@@ -54,7 +54,7 @@
  * 	DAT_INVALID_STATE
  * 	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_pz_free (
     IN	DAT_PZ_HANDLE   pz_handle)
 {
diff --git a/dapl/common/dapl_pz_query.c b/dapl/common/dapl_pz_query.c
index f0b8cbb..c00555b 100644
--- a/dapl/common/dapl_pz_query.c
+++ b/dapl/common/dapl_pz_query.c
@@ -53,7 +53,7 @@
  *      DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_pz_query (
     IN	DAT_PZ_HANDLE		pz_handle,
     IN	DAT_PZ_PARAM_MASK	pz_param_mask,
diff --git a/dapl/common/dapl_rmr_bind.c b/dapl/common/dapl_rmr_bind.c
index ff8fb5d..01d06c3 100755
--- a/dapl/common/dapl_rmr_bind.c
+++ b/dapl/common/dapl_rmr_bind.c
@@ -301,7 +301,7 @@ bail1:
  * Input:
  * Output:
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rmr_bind (
 	IN	DAT_RMR_HANDLE		rmr_handle,
 	IN	DAT_LMR_HANDLE		lmr_handle,
diff --git a/dapl/common/dapl_rmr_create.c b/dapl/common/dapl_rmr_create.c
index 2c6e179..9a7dbd9 100755
--- a/dapl/common/dapl_rmr_create.c
+++ b/dapl/common/dapl_rmr_create.c
@@ -53,7 +53,7 @@
  * 	DAT_INSUFFICIENT_RESOURCES
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rmr_create (
 	IN	DAT_PZ_HANDLE	   pz_handle,
 	OUT	DAT_RMR_HANDLE	   *rmr_handle)
@@ -126,7 +126,7 @@ dapl_rmr_create (
  *	DAT_INVALID_HANDLE
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rmr_create_for_ep (
 	IN      DAT_PZ_HANDLE pz_handle,	/* pz_handle            */
 	OUT     DAT_RMR_HANDLE *rmr_handle)	/* rmr_handle           */
diff --git a/dapl/common/dapl_rmr_free.c b/dapl/common/dapl_rmr_free.c
index 1277178..a4edb13 100644
--- a/dapl/common/dapl_rmr_free.c
+++ b/dapl/common/dapl_rmr_free.c
@@ -53,7 +53,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rmr_free (
     IN	DAT_RMR_HANDLE  rmr_handle )
 {
diff --git a/dapl/common/dapl_rmr_query.c b/dapl/common/dapl_rmr_query.c
index 9652a24..6e6be07 100644
--- a/dapl/common/dapl_rmr_query.c
+++ b/dapl/common/dapl_rmr_query.c
@@ -57,7 +57,7 @@
  *      DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rmr_query (
 	IN	DAT_RMR_HANDLE		rmr_handle,
 	IN	DAT_RMR_PARAM_MASK   	rmr_param_mask,
diff --git a/dapl/common/dapl_rsp_create.c b/dapl/common/dapl_rsp_create.c
index 12107f6..a9c9b5f 100644
--- a/dapl/common/dapl_rsp_create.c
+++ b/dapl/common/dapl_rsp_create.c
@@ -68,7 +68,7 @@
  *	DAT_INVALID_STATE
  *	DAT_CONN_QUAL_IN_USE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rsp_create (
 	IN	DAT_IA_HANDLE	   ia_handle,
 	IN	DAT_CONN_QUAL	   conn_qual,
diff --git a/dapl/common/dapl_rsp_free.c b/dapl/common/dapl_rsp_free.c
index 5ce0682..b7bc40c 100644
--- a/dapl/common/dapl_rsp_free.c
+++ b/dapl/common/dapl_rsp_free.c
@@ -58,7 +58,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rsp_free (
 	IN	DAT_RSP_HANDLE	   rsp_handle )
 {
diff --git a/dapl/common/dapl_rsp_query.c b/dapl/common/dapl_rsp_query.c
index 737bbe5..3514299 100644
--- a/dapl/common/dapl_rsp_query.c
+++ b/dapl/common/dapl_rsp_query.c
@@ -56,7 +56,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_rsp_query (
 	IN	DAT_RSP_HANDLE	   rsp_handle,
 	IN	DAT_RSP_PARAM_MASK  rsp_mask,
diff --git a/dapl/common/dapl_set_consumer_context.c b/dapl/common/dapl_set_consumer_context.c
index 883de1f..e43be33 100644
--- a/dapl/common/dapl_set_consumer_context.c
+++ b/dapl/common/dapl_set_consumer_context.c
@@ -56,7 +56,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_set_consumer_context (
 	IN	DAT_HANDLE  dat_handle,
 	IN	DAT_CONTEXT context )
diff --git a/dapl/common/dapl_srq_create.c b/dapl/common/dapl_srq_create.c
index 6ae260e..66e9d0e 100644
--- a/dapl/common/dapl_srq_create.c
+++ b/dapl/common/dapl_srq_create.c
@@ -66,7 +66,7 @@
  *	?DAT_INVALID_ATTRIBUTE??
  *	DAT_MODEL_NOT_SUPPORTED
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_create (
 	IN	DAT_IA_HANDLE	   	ia_handle,
 	IN	DAT_PZ_HANDLE	   	pz_handle,
diff --git a/dapl/common/dapl_srq_free.c b/dapl/common/dapl_srq_free.c
index 8eaff02..55d74fc 100644
--- a/dapl/common/dapl_srq_free.c
+++ b/dapl/common/dapl_srq_free.c
@@ -59,7 +59,7 @@
  *	DAT_INVALID_PARAMETER
  *	DAT_INVALID_STATE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_free (
 	IN	DAT_SRQ_HANDLE	   srq_handle)
 {
diff --git a/dapl/common/dapl_srq_post_recv.c b/dapl/common/dapl_srq_post_recv.c
index 8751620..e37f7ed 100644
--- a/dapl/common/dapl_srq_post_recv.c
+++ b/dapl/common/dapl_srq_post_recv.c
@@ -67,7 +67,7 @@
  * 	DAT_PROTECTION_VIOLATION
  * 	DAT_PROVILEGES_VIOLATION
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_post_recv (
 	IN	DAT_SRQ_HANDLE	   	srq_handle,
 	IN	DAT_COUNT	   	num_segments,
diff --git a/dapl/common/dapl_srq_query.c b/dapl/common/dapl_srq_query.c
index 8265f92..779a196 100644
--- a/dapl/common/dapl_srq_query.c
+++ b/dapl/common/dapl_srq_query.c
@@ -58,7 +58,7 @@
  *      DAT_INVALID_HANDLE
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_query (
 	IN	DAT_SRQ_HANDLE		srq_handle,
 	IN	DAT_SRQ_PARAM_MASK	srq_param_mask,
diff --git a/dapl/common/dapl_srq_resize.c b/dapl/common/dapl_srq_resize.c
index 8f7adf5..54697ce 100644
--- a/dapl/common/dapl_srq_resize.c
+++ b/dapl/common/dapl_srq_resize.c
@@ -63,7 +63,7 @@
  * 	DAT_INVALID_STATE
  */
 
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_resize (
 	IN	DAT_SRQ_HANDLE	   srq_handle,
 	IN	DAT_COUNT	   srq_max_recv_dto )
diff --git a/dapl/common/dapl_srq_set_lw.c b/dapl/common/dapl_srq_set_lw.c
index d8a3acc..bd52e21 100644
--- a/dapl/common/dapl_srq_set_lw.c
+++ b/dapl/common/dapl_srq_set_lw.c
@@ -63,7 +63,7 @@
  * 	DAT_MODEL_NOT_SUPPORTED
  */
 
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_srq_set_lw (
 	IN	DAT_SRQ_HANDLE	   srq_handle,
 	IN	DAT_COUNT	   low_watermark )
diff --git a/dapl/include/dapl.h b/dapl/include/dapl.h
index 81cbcf9..ade101b 100755
--- a/dapl/include/dapl.h
+++ b/dapl/include/dapl.h
@@ -688,18 +688,18 @@ void dapls_io_trc_dump (
  * DAT Mandated functions
  */
 
-extern DAT_RETURN dapl_ia_open (
+extern DAT_RETURN DAT_API dapl_ia_open (
 	IN	const DAT_NAME_PTR,	/* name */
 	IN	DAT_COUNT,		/* asynch_evd_qlen */
 	INOUT	DAT_EVD_HANDLE *,	/* asynch_evd_handle */
 	OUT	DAT_IA_HANDLE *);	/* ia_handle */
 
-extern DAT_RETURN dapl_ia_close (
+extern DAT_RETURN DAT_API dapl_ia_close (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_CLOSE_FLAGS );	/* ia_flags */
 
 
-extern DAT_RETURN dapl_ia_query (
+extern DAT_RETURN DAT_API dapl_ia_query (
 	IN	DAT_IA_HANDLE,		/* ia handle */
 	OUT	DAT_EVD_HANDLE *,	/* async_evd_handle */
 	IN	DAT_IA_ATTR_MASK,	/* ia_params_mask */
@@ -710,52 +710,52 @@ extern DAT_RETURN dapl_ia_query (
 
 /* helper functions */
 
-extern DAT_RETURN dapl_set_consumer_context (
+extern DAT_RETURN DAT_API dapl_set_consumer_context (
 	IN	DAT_HANDLE,			/* dat handle */
 	IN	DAT_CONTEXT);			/* context */
 
-extern DAT_RETURN dapl_get_consumer_context (
+extern DAT_RETURN DAT_API dapl_get_consumer_context (
 	IN	DAT_HANDLE,			/* dat handle */
 	OUT	DAT_CONTEXT * );		/* context */
 
-extern DAT_RETURN dapl_get_handle_type (
+extern DAT_RETURN DAT_API dapl_get_handle_type (
 	IN	DAT_HANDLE,
 	OUT	DAT_HANDLE_TYPE * );
 
 /* CNO functions */
 
 #if !defined(__KERNEL__)
-extern DAT_RETURN dapl_cno_create (
+extern DAT_RETURN DAT_API dapl_cno_create (
 	IN	DAT_IA_HANDLE,			/* ia_handle */
 	IN	DAT_OS_WAIT_PROXY_AGENT,	/* agent */
 	OUT	DAT_CNO_HANDLE *);		/* cno_handle */
 
-extern DAT_RETURN dapl_cno_modify_agent (
+extern DAT_RETURN DAT_API dapl_cno_modify_agent (
 	IN	DAT_CNO_HANDLE,			/* cno_handle */
 	IN	DAT_OS_WAIT_PROXY_AGENT);	/* agent */
 
-extern DAT_RETURN dapl_cno_query (
+extern DAT_RETURN DAT_API dapl_cno_query (
 	IN	DAT_CNO_HANDLE,		/* cno_handle */
 	IN	DAT_CNO_PARAM_MASK,	/* cno_param_mask */
 	OUT	DAT_CNO_PARAM * );	/* cno_param */
 
-extern DAT_RETURN dapl_cno_free (
+extern DAT_RETURN DAT_API dapl_cno_free (
 	IN	DAT_CNO_HANDLE);	/* cno_handle */
 
-extern DAT_RETURN dapl_cno_wait (
+extern DAT_RETURN DAT_API dapl_cno_wait (
 	IN	DAT_CNO_HANDLE,		/* cno_handle */
 	IN	DAT_TIMEOUT,		/* timeout */
 	OUT	DAT_EVD_HANDLE *);	/* evd_handle */
 
-extern DAT_RETURN dapl_cno_free (
+extern DAT_RETURN DAT_API dapl_cno_free (
 	IN	DAT_CNO_HANDLE);	/* cno_handle */
 
-extern DAT_RETURN dapl_cno_fd_create (
+extern DAT_RETURN DAT_API dapl_cno_fd_create (
 	IN 	DAT_IA_HANDLE,		/* ia_handle            */
 	OUT	DAT_FD *,		/* file_descriptor	*/
 	OUT 	DAT_CNO_HANDLE *);	/* cno_handle           */
 
-extern DAT_RETURN dapl_cno_trigger(
+extern DAT_RETURN DAT_API dapl_cno_trigger(
 	IN	DAT_CNO_HANDLE,		/* cno_handle */
 	OUT	DAT_EVD_HANDLE *);	/* evd_handle */
 
@@ -763,30 +763,30 @@ extern DAT_RETURN dapl_cno_trigger(
 
 /* CR Functions */
 
-extern DAT_RETURN dapl_cr_query (
+extern DAT_RETURN DAT_API dapl_cr_query (
 	IN	DAT_CR_HANDLE,		/* cr_handle */
 	IN	DAT_CR_PARAM_MASK,	/* cr_args_mask */
 	OUT	DAT_CR_PARAM * );	/* cwr_args */
 
-extern DAT_RETURN dapl_cr_accept (
+extern DAT_RETURN DAT_API dapl_cr_accept (
 	IN	DAT_CR_HANDLE,		/* cr_handle */
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_COUNT,		/* private_data_size */
 	IN	const DAT_PVOID );	/* private_data */
 
-extern DAT_RETURN dapl_cr_reject (
+extern DAT_RETURN DAT_API dapl_cr_reject (
 	IN      DAT_CR_HANDLE, 		/* cr_handle            */
 	IN	DAT_COUNT,		/* private_data_size	*/
 	IN	const DAT_PVOID );      /* private_data         */
 
-extern DAT_RETURN dapl_cr_handoff (
+extern DAT_RETURN DAT_API dapl_cr_handoff (
 	IN DAT_CR_HANDLE,		/* cr_handle */
 	IN DAT_CONN_QUAL);		/* handoff */
 
 /* EVD Functions */
 
 #if defined(__KERNEL__)
-extern DAT_RETURN dapl_ia_memtype_hint (
+extern DAT_RETURN DAT_API dapl_ia_memtype_hint (
 	IN    DAT_IA_HANDLE,		/* ia_handle */
 	IN    DAT_MEM_TYPE,		/* mem_type */
 	IN    DAT_VLEN,			/* length */
@@ -794,7 +794,7 @@ extern DAT_RETURN dapl_ia_memtype_hint (
 	OUT   DAT_VLEN *,		/* suggested_length */
 	OUT   DAT_VADDR	*);		/* suggested_alignment */
 
-extern DAT_RETURN dapl_evd_kcreate (
+extern DAT_RETURN DAT_API dapl_evd_kcreate (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_COUNT,		/* evd_min_qlen */
 	IN	DAT_UPCALL_POLICY,	/* upcall_policy */
@@ -802,46 +802,46 @@ extern DAT_RETURN dapl_evd_kcreate (
 	IN	DAT_EVD_FLAGS,		/* evd_flags */
 	OUT	DAT_EVD_HANDLE * );	/* evd_handle */
 
-extern DAT_RETURN dapl_evd_kquery (
+extern DAT_RETURN DAT_API dapl_evd_kquery (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_EVD_PARAM_MASK,	/* evd_args_mask */
 	OUT	DAT_EVD_PARAM * );	/* evd_args */
 
 #else
-extern DAT_RETURN dapl_evd_create (
+extern DAT_RETURN DAT_API dapl_evd_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_COUNT,		/* evd_min_qlen */
 	IN	DAT_CNO_HANDLE,		/* cno_handle */
 	IN	DAT_EVD_FLAGS,		/* evd_flags */
 	OUT	DAT_EVD_HANDLE * );	/* evd_handle */
 
-extern DAT_RETURN dapl_evd_query (
+extern DAT_RETURN DAT_API dapl_evd_query (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_EVD_PARAM_MASK,	/* evd_args_mask */
 	OUT	DAT_EVD_PARAM * );	/* evd_args */
 #endif	/* defined(__KERNEL__) */
 
 #if defined(__KERNEL__)
-extern DAT_RETURN dapl_evd_modify_upcall (
+extern DAT_RETURN DAT_API dapl_evd_modify_upcall (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_UPCALL_POLICY,	/* upcall_policy */
 	IN	const DAT_UPCALL_OBJECT * ); /* upcall */
 
 #else
 
-extern DAT_RETURN dapl_evd_modify_cno (
+extern DAT_RETURN DAT_API dapl_evd_modify_cno (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_CNO_HANDLE);	/* cno_handle */
 #endif
 
-extern DAT_RETURN dapl_evd_enable (
+extern DAT_RETURN DAT_API dapl_evd_enable (
 	IN	DAT_EVD_HANDLE);	/* evd_handle */
 
-extern DAT_RETURN dapl_evd_disable (
+extern DAT_RETURN DAT_API dapl_evd_disable (
 	IN	DAT_EVD_HANDLE);	/* evd_handle */
 
 #if !defined(__KERNEL__)
-extern DAT_RETURN dapl_evd_wait (
+extern DAT_RETURN DAT_API dapl_evd_wait (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_TIMEOUT,		/* timeout */
 	IN	DAT_COUNT,		/* threshold */
@@ -849,32 +849,32 @@ extern DAT_RETURN dapl_evd_wait (
 	OUT	DAT_COUNT *);		/* nmore */
 #endif	/* !defined(__KERNEL__) */
 
-extern DAT_RETURN dapl_evd_resize (
+extern DAT_RETURN DAT_API dapl_evd_resize (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_COUNT );		/* evd_qlen */
 
-extern DAT_RETURN dapl_evd_post_se (
+extern DAT_RETURN DAT_API dapl_evd_post_se (
 	DAT_EVD_HANDLE,			/* evd_handle */
 	const DAT_EVENT * );		/* event */
 
-extern DAT_RETURN dapl_evd_dequeue (
+extern DAT_RETURN DAT_API dapl_evd_dequeue (
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	OUT	DAT_EVENT * );		/* event */
 
-extern DAT_RETURN dapl_evd_free (
+extern DAT_RETURN DAT_API dapl_evd_free (
 	IN	DAT_EVD_HANDLE );
 
-extern DAT_RETURN
+extern DAT_RETURN DAT_API
 dapl_evd_set_unwaitable (
 	IN	DAT_EVD_HANDLE	evd_handle );
 
-extern DAT_RETURN
+extern DAT_RETURN DAT_API
 dapl_evd_clear_unwaitable (
 	IN	DAT_EVD_HANDLE	evd_handle );
 
 /* EP functions */
 
-extern DAT_RETURN dapl_ep_create (
+extern DAT_RETURN DAT_API dapl_ep_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_PZ_HANDLE,		/* pz_handle */
 	IN	DAT_EVD_HANDLE,		/* in_dto_completion_evd_handle */
@@ -883,17 +883,17 @@ extern DAT_RETURN dapl_ep_create (
 	IN	const DAT_EP_ATTR *,	/* ep_parameters */
 	OUT	DAT_EP_HANDLE * );	/* ep_handle */
 
-extern DAT_RETURN dapl_ep_query (
+extern DAT_RETURN DAT_API dapl_ep_query (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_EP_PARAM_MASK,	/* ep_args_mask */
 	OUT	DAT_EP_PARAM * );	/* ep_args */
 
-extern DAT_RETURN dapl_ep_modify (
+extern DAT_RETURN DAT_API dapl_ep_modify (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_EP_PARAM_MASK,	/* ep_args_mask */
 	IN	const DAT_EP_PARAM * ); /* ep_args */
 
-extern DAT_RETURN dapl_ep_connect (
+extern DAT_RETURN DAT_API dapl_ep_connect (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_IA_ADDRESS_PTR,	/* remote_ia_address */
 	IN	DAT_CONN_QUAL,		/* remote_conn_qual */
@@ -903,14 +903,14 @@ extern DAT_RETURN dapl_ep_connect (
 	IN	DAT_QOS,		/* quality_of_service */
 	IN	DAT_CONNECT_FLAGS );	/* connect_flags */
 
-extern DAT_RETURN dapl_ep_common_connect (
+extern DAT_RETURN DAT_API dapl_ep_common_connect (
 	IN      DAT_EP_HANDLE ep,		/* ep_handle            */
 	IN      DAT_IA_ADDRESS_PTR remote_addr,	/* remote_ia_address    */
 	IN      DAT_TIMEOUT timeout,		/* timeout              */
 	IN      DAT_COUNT pdata_size,		/* private_data_size    */
 	IN      const DAT_PVOID pdata	);	/* private_data         */
 
-extern DAT_RETURN dapl_ep_dup_connect (
+extern DAT_RETURN DAT_API dapl_ep_dup_connect (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_EP_HANDLE,		/* ep_dup_handle */
 	IN	DAT_TIMEOUT,		/* timeout*/
@@ -918,25 +918,25 @@ extern DAT_RETURN dapl_ep_dup_connect (
 	IN	const DAT_PVOID,	/* private_data */
 	IN	DAT_QOS);		/* quality_of_service */
 
-extern DAT_RETURN dapl_ep_disconnect (
+extern DAT_RETURN DAT_API dapl_ep_disconnect (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_CLOSE_FLAGS );	/* close_flags */
 
-extern DAT_RETURN dapl_ep_post_send (
+extern DAT_RETURN DAT_API dapl_ep_post_send (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_COUNT,		/* num_segments */
 	IN	DAT_LMR_TRIPLET *,	/* local_iov */
 	IN	DAT_DTO_COOKIE,		/* user_cookie */
 	IN	DAT_COMPLETION_FLAGS ); /* completion_flags */
 
-extern DAT_RETURN dapl_ep_post_recv (
+extern DAT_RETURN DAT_API dapl_ep_post_recv (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_COUNT,		/* num_segments */
 	IN	DAT_LMR_TRIPLET *,	/* local_iov */
 	IN	DAT_DTO_COOKIE,		/* user_cookie */
 	IN	DAT_COMPLETION_FLAGS ); /* completion_flags */
 
-extern DAT_RETURN dapl_ep_post_rdma_read (
+extern DAT_RETURN DAT_API dapl_ep_post_rdma_read (
 	IN	DAT_EP_HANDLE,		 /* ep_handle */
 	IN	DAT_COUNT,		 /* num_segments */
 	IN	DAT_LMR_TRIPLET *,	 /* local_iov */
@@ -944,14 +944,14 @@ extern DAT_RETURN dapl_ep_post_rdma_read (
 	IN	const DAT_RMR_TRIPLET *, /* remote_iov */
 	IN	DAT_COMPLETION_FLAGS );	 /* completion_flags */
 
-extern DAT_RETURN dapl_ep_post_rdma_read_to_rmr (
+extern DAT_RETURN DAT_API dapl_ep_post_rdma_read_to_rmr (
 	IN      DAT_EP_HANDLE,	        /* ep_handle            */
 	IN      const DAT_RMR_TRIPLET *,/* local_iov            */
 	IN      DAT_DTO_COOKIE,		/* user_cookie          */
 	IN      const DAT_RMR_TRIPLET *,/* remote_iov           */
 	IN      DAT_COMPLETION_FLAGS);	/* completion_flags     */
 
-extern DAT_RETURN dapl_ep_post_rdma_write (
+extern DAT_RETURN DAT_API dapl_ep_post_rdma_write (
 	IN	DAT_EP_HANDLE,		 /* ep_handle */
 	IN	DAT_COUNT,		 /* num_segments */
 	IN	DAT_LMR_TRIPLET *,	 /* local_iov */
@@ -959,7 +959,7 @@ extern DAT_RETURN dapl_ep_post_rdma_write (
 	IN	const DAT_RMR_TRIPLET *, /* remote_iov */
 	IN	DAT_COMPLETION_FLAGS );	 /* completion_flags */
 
-extern DAT_RETURN dapl_ep_post_send_with_invalidate (
+extern DAT_RETURN DAT_API dapl_ep_post_send_with_invalidate (
 	IN      DAT_EP_HANDLE,          /* ep_handle            */
 	IN      DAT_COUNT,              /* num_segments         */
 	IN      DAT_LMR_TRIPLET *,      /* local_iov            */
@@ -968,19 +968,19 @@ extern DAT_RETURN dapl_ep_post_send_with_invalidate (
 	IN      DAT_BOOLEAN,            /* invalidate_flag      */
 	IN      DAT_RMR_CONTEXT);      /* RMR context          */
 
-extern DAT_RETURN dapl_ep_get_status (
+extern DAT_RETURN DAT_API dapl_ep_get_status (
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	OUT	DAT_EP_STATE *,		/* ep_state */
 	OUT	DAT_BOOLEAN *,		/* in_dto_idle */
 	OUT	DAT_BOOLEAN * );	/* out_dto_idle */
 
-extern DAT_RETURN dapl_ep_free (
+extern DAT_RETURN DAT_API dapl_ep_free (
 	IN	DAT_EP_HANDLE);		/* ep_handle */
 
-extern DAT_RETURN dapl_ep_reset (
+extern DAT_RETURN DAT_API dapl_ep_reset (
 	IN	DAT_EP_HANDLE);		/* ep_handle */
 
-extern DAT_RETURN dapl_ep_create_with_srq (
+extern DAT_RETURN DAT_API dapl_ep_create_with_srq (
         IN      DAT_IA_HANDLE,          /* ia_handle            */
         IN      DAT_PZ_HANDLE,          /* pz_handle            */
         IN      DAT_EVD_HANDLE,         /* recv_evd_handle      */
@@ -990,12 +990,12 @@ extern DAT_RETURN dapl_ep_create_with_srq (
         IN      const DAT_EP_ATTR *,    /* ep_attributes        */
         OUT     DAT_EP_HANDLE *);       /* ep_handle            */
 
-extern DAT_RETURN dapl_ep_recv_query (
+extern DAT_RETURN DAT_API dapl_ep_recv_query (
         IN      DAT_EP_HANDLE,          /* ep_handle            */
         OUT     DAT_COUNT *,            /* nbufs_allocated      */
         OUT     DAT_COUNT *);           /* bufs_alloc_span      */
 
-extern DAT_RETURN dapl_ep_set_watermark (
+extern DAT_RETURN DAT_API dapl_ep_set_watermark (
         IN      DAT_EP_HANDLE,          /* ep_handle            */
         IN      DAT_COUNT,              /* soft_high_watermark  */
         IN      DAT_COUNT);             /* hard_high_watermark  */
@@ -1003,7 +1003,7 @@ extern DAT_RETURN dapl_ep_set_watermark (
 /* LMR functions */
 
 #if defined(__KERNEL__)
-extern DAT_RETURN dapl_lmr_kcreate (
+extern DAT_RETURN DAT_API dapl_lmr_kcreate (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_MEM_TYPE,		/* mem_type */
 	IN	DAT_REGION_DESCRIPTION, /* region_description */
@@ -1018,7 +1018,7 @@ extern DAT_RETURN dapl_lmr_kcreate (
 	OUT	DAT_VLEN *,		/* registered_length */
 	OUT	DAT_VADDR * );		/* registered_address */
 #else
-extern DAT_RETURN dapl_lmr_create (
+extern DAT_RETURN DAT_API dapl_lmr_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_MEM_TYPE,		/* mem_type */
 	IN	DAT_REGION_DESCRIPTION, /* region_description */
@@ -1033,40 +1033,40 @@ extern DAT_RETURN dapl_lmr_create (
 	OUT	DAT_VADDR * );		/* registered_address */
 #endif	/* defined(__KERNEL__) */
 
-extern DAT_RETURN dapl_lmr_query (
+extern DAT_RETURN DAT_API dapl_lmr_query (
 	IN	DAT_LMR_HANDLE,
 	IN	DAT_LMR_PARAM_MASK,
 	OUT	DAT_LMR_PARAM *);
 
-extern DAT_RETURN dapl_lmr_free (
+extern DAT_RETURN DAT_API dapl_lmr_free (
 	IN	DAT_LMR_HANDLE);
 
-extern DAT_RETURN dapl_lmr_sync_rdma_read(
+extern DAT_RETURN DAT_API dapl_lmr_sync_rdma_read(
 	IN      DAT_IA_HANDLE,          /* ia_handle            */
 	IN      const DAT_LMR_TRIPLET *, /* local_segments      */
 	IN      DAT_VLEN);              /* num_segments         */
 
-extern DAT_RETURN dapl_lmr_sync_rdma_write(
+extern DAT_RETURN DAT_API dapl_lmr_sync_rdma_write(
 	IN      DAT_IA_HANDLE,          /* ia_handle            */
 	IN      const DAT_LMR_TRIPLET *, /* local_segments      */
 	IN      DAT_VLEN);              /* num_segments         */
 
 /* RMR Functions */
 
-extern DAT_RETURN dapl_rmr_create (
+extern DAT_RETURN DAT_API dapl_rmr_create (
 	IN	DAT_PZ_HANDLE,		/* pz_handle */
 	OUT	DAT_RMR_HANDLE *);	/* rmr_handle */
 
-extern DAT_RETURN dapl_rmr_create_for_ep (
+extern DAT_RETURN DAT_API dapl_rmr_create_for_ep (
 	IN      DAT_PZ_HANDLE pz_handle,	/* pz_handle    */
 	OUT     DAT_RMR_HANDLE *rmr_handle);	/* rmr_handle   */
 
-extern DAT_RETURN dapl_rmr_query (
+extern DAT_RETURN DAT_API dapl_rmr_query (
 	IN	DAT_RMR_HANDLE,		/* rmr_handle */
 	IN	DAT_RMR_PARAM_MASK,	/* rmr_args_mask */
 	OUT	DAT_RMR_PARAM *);	/* rmr_args */
 
-extern DAT_RETURN dapl_rmr_bind (
+extern DAT_RETURN DAT_API dapl_rmr_bind (
 	IN	DAT_RMR_HANDLE,		 /* rmr_handle */
 	IN	DAT_LMR_HANDLE,		 /* lmr_handle */
 	IN	const DAT_LMR_TRIPLET *, /* lmr_triplet */
@@ -1077,119 +1077,119 @@ extern DAT_RETURN dapl_rmr_bind (
 	IN	DAT_COMPLETION_FLAGS,	 /* completion_flags */
 	INOUT	DAT_RMR_CONTEXT * );	 /* context */
 
-extern DAT_RETURN dapl_rmr_free (
+extern DAT_RETURN DAT_API dapl_rmr_free (
 	IN	DAT_RMR_HANDLE);
 
 /* PSP Functions */
 
-extern DAT_RETURN dapl_psp_create (
+extern DAT_RETURN DAT_API dapl_psp_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_CONN_QUAL,		/* conn_qual */
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_PSP_FLAGS,		/* psp_flags */
 	OUT	DAT_PSP_HANDLE * );	/* psp_handle */
 
-extern DAT_RETURN dapl_psp_create_any (
+extern DAT_RETURN DAT_API dapl_psp_create_any (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	OUT	DAT_CONN_QUAL *,	/* conn_qual */
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	IN	DAT_PSP_FLAGS,		/* psp_flags */
 	OUT	DAT_PSP_HANDLE *);	/* psp_handle */
 
-extern DAT_RETURN dapl_psp_query (
+extern DAT_RETURN DAT_API dapl_psp_query (
 	IN	DAT_PSP_HANDLE,
 	IN	DAT_PSP_PARAM_MASK,
 	OUT	DAT_PSP_PARAM * );
 
-extern DAT_RETURN dapl_psp_free (
+extern DAT_RETURN DAT_API dapl_psp_free (
 	IN	DAT_PSP_HANDLE );	/* psp_handle */
 
 /* RSP Functions */
 
-extern DAT_RETURN dapl_rsp_create (
+extern DAT_RETURN DAT_API dapl_rsp_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	IN	DAT_CONN_QUAL,		/* conn_qual */
 	IN	DAT_EP_HANDLE,		/* ep_handle */
 	IN	DAT_EVD_HANDLE,		/* evd_handle */
 	OUT	DAT_RSP_HANDLE * );	/* rsp_handle */
 
-extern DAT_RETURN dapl_rsp_query (
+extern DAT_RETURN DAT_API dapl_rsp_query (
 	IN	DAT_RSP_HANDLE,
 	IN	DAT_RSP_PARAM_MASK,
 	OUT	DAT_RSP_PARAM * );
 
-extern DAT_RETURN dapl_rsp_free (
+extern DAT_RETURN DAT_API dapl_rsp_free (
 	IN	DAT_RSP_HANDLE );	/* rsp_handle */
 
 /* PZ Functions */
 
-extern DAT_RETURN dapl_pz_create (
+extern DAT_RETURN DAT_API dapl_pz_create (
 	IN	DAT_IA_HANDLE,		/* ia_handle */
 	OUT	DAT_PZ_HANDLE * );	/* pz_handle */
 
-extern DAT_RETURN dapl_pz_query (
+extern DAT_RETURN DAT_API dapl_pz_query (
 	IN	DAT_PZ_HANDLE,		/* pz_handle */
 	IN	DAT_PZ_PARAM_MASK,	/* pz_args_mask */
 	OUT	DAT_PZ_PARAM * );	/* pz_args */
 
-extern DAT_RETURN dapl_pz_free (
+extern DAT_RETURN DAT_API dapl_pz_free (
 	IN	DAT_PZ_HANDLE );	/* pz_handle */
 
 /* SRQ functions */
 
-extern DAT_RETURN dapl_srq_create(
+extern DAT_RETURN DAT_API dapl_srq_create(
         IN      DAT_IA_HANDLE,          /* ia_handle            */
         IN      DAT_PZ_HANDLE,          /* pz_handle            */
         IN      DAT_SRQ_ATTR *,         /* srq_attr             */
         OUT     DAT_SRQ_HANDLE *);      /* srq_handle           */
 
-extern DAT_RETURN dapl_srq_free(
+extern DAT_RETURN DAT_API dapl_srq_free(
 	IN      DAT_SRQ_HANDLE);        /* srq_handle           */
 
-extern DAT_RETURN dapl_srq_post_recv(
+extern DAT_RETURN DAT_API dapl_srq_post_recv(
 	IN      DAT_SRQ_HANDLE,         /* srq_handle           */
 	IN      DAT_COUNT,              /* num_segments         */
 	IN      DAT_LMR_TRIPLET *,      /* local_iov            */
 	IN      DAT_DTO_COOKIE);        /* user_cookie          */
 
-extern DAT_RETURN dapl_srq_query(
+extern DAT_RETURN DAT_API dapl_srq_query(
 	IN      DAT_SRQ_HANDLE,         /* srq_handle           */
 	IN      DAT_SRQ_PARAM_MASK,     /* srq_param_mask       */
 	OUT     DAT_SRQ_PARAM *);       /* srq_param            */
 
-extern DAT_RETURN dapl_srq_resize(
+extern DAT_RETURN DAT_API dapl_srq_resize(
 	IN      DAT_SRQ_HANDLE,         /* srq_handle           */
 	IN      DAT_COUNT);             /* srq_max_recv_dto     */
 
-extern DAT_RETURN dapl_srq_set_lw(
+extern DAT_RETURN DAT_API dapl_srq_set_lw(
 	IN      DAT_SRQ_HANDLE,         /* srq_handle           */
 	IN      DAT_COUNT);             /* low_watermark        */
 
 /* CSP functions */
-extern DAT_RETURN dapl_csp_create(
+extern DAT_RETURN DAT_API dapl_csp_create(
 	IN      DAT_IA_HANDLE,          /* ia_handle      */
 	IN      DAT_COMM *,             /* communicator   */
 	IN      DAT_IA_ADDRESS_PTR,     /* address        */
 	IN      DAT_EVD_HANDLE,         /* evd_handle     */
 	OUT     DAT_CSP_HANDLE *);      /* csp_handle     */
 
-extern DAT_RETURN dapl_csp_query(
+extern DAT_RETURN DAT_API dapl_csp_query(
 	IN      DAT_CSP_HANDLE,         /* csp_handle     */
 	IN      DAT_CSP_PARAM_MASK,     /* csp_param_mask */
 	OUT     DAT_CSP_PARAM *);       /* csp_param      */
 
-extern DAT_RETURN dapl_csp_free( 
+extern DAT_RETURN DAT_API dapl_csp_free( 
 	IN      DAT_CSP_HANDLE);        /* csp_handle     */
 
 /* HA functions */
-DAT_RETURN dapl_ia_ha(
+DAT_RETURN DAT_API dapl_ia_ha(
 	IN	 DAT_IA_HANDLE,         /* ia_handle */
 	IN const DAT_NAME_PTR,          /* provider  */
 	OUT	 DAT_BOOLEAN *);        /* answer    */
 
 #ifdef DAT_EXTENSIONS
 #include <stdarg.h>
-extern DAT_RETURN dapl_extensions(
+extern DAT_RETURN DAT_API dapl_extensions(
 	IN	DAT_HANDLE,		/* handle */
 	IN	DAT_EXTENDED_OP,	/* extended op */
 	IN	va_list);		/* argument list */
diff --git a/dapl/udapl/dapl_cno_create.c b/dapl/udapl/dapl_cno_create.c
index 8ddedc6..088992a 100644
--- a/dapl/udapl/dapl_cno_create.c
+++ b/dapl/udapl/dapl_cno_create.c
@@ -61,7 +61,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN dapl_cno_create(
+DAT_RETURN DAT_API dapl_cno_create(
 	IN	DAT_IA_HANDLE			ia_handle,	/* ia_handle */
 	IN	DAT_OS_WAIT_PROXY_AGENT		wait_agent,	/* agent */
 	OUT	DAT_CNO_HANDLE			*cno_handle)	/* cno_handle */
diff --git a/dapl/udapl/dapl_cno_free.c b/dapl/udapl/dapl_cno_free.c
index cf9d7ef..053bde6 100644
--- a/dapl/udapl/dapl_cno_free.c
+++ b/dapl/udapl/dapl_cno_free.c
@@ -58,7 +58,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_INVALID_STATE
  */
-DAT_RETURN dapl_cno_free(
+DAT_RETURN DAT_API dapl_cno_free(
 	IN	DAT_CNO_HANDLE			cno_handle)	/* cno_handle */
 
 {
diff --git a/dapl/udapl/dapl_cno_modify_agent.c b/dapl/udapl/dapl_cno_modify_agent.c
index 74992d3..c4847ff 100644
--- a/dapl/udapl/dapl_cno_modify_agent.c
+++ b/dapl/udapl/dapl_cno_modify_agent.c
@@ -57,7 +57,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN dapl_cno_modify_agent(
+DAT_RETURN DAT_API dapl_cno_modify_agent(
 	IN	DAT_CNO_HANDLE		cno_handle,	/* cno_handle */
 	IN	DAT_OS_WAIT_PROXY_AGENT	prx_agent )	/* agent */
 
diff --git a/dapl/udapl/dapl_cno_query.c b/dapl/udapl/dapl_cno_query.c
index 2901e2e..b7275be 100644
--- a/dapl/udapl/dapl_cno_query.c
+++ b/dapl/udapl/dapl_cno_query.c
@@ -61,7 +61,7 @@
  *	DAT_INVALID_HANDLE
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN dapl_cno_query(
+DAT_RETURN DAT_API dapl_cno_query(
 	IN	DAT_CNO_HANDLE		cno_handle,	/* cno_handle */
 	IN	DAT_CNO_PARAM_MASK	cno_param_mask,	/* cno_param_mask */
 	OUT	DAT_CNO_PARAM 		*cno_param )	/* cno_param */
diff --git a/dapl/udapl/dapl_cno_wait.c b/dapl/udapl/dapl_cno_wait.c
index 3026b01..fce9f88 100644
--- a/dapl/udapl/dapl_cno_wait.c
+++ b/dapl/udapl/dapl_cno_wait.c
@@ -59,7 +59,7 @@
  *	DAT_QUEUE_EMPTY
  *	DAT_INVALID_PARAMETER
  */
-DAT_RETURN dapl_cno_wait(
+DAT_RETURN DAT_API dapl_cno_wait(
 	IN	DAT_CNO_HANDLE		cno_handle,	/* cno_handle */
 	IN	DAT_TIMEOUT		timeout,	/* agent */
 	OUT	DAT_EVD_HANDLE		*evd_handle)	/* ia_handle */
diff --git a/dapl/udapl/dapl_evd_clear_unwaitable.c b/dapl/udapl/dapl_evd_clear_unwaitable.c
index 40614e8..35dd3ae 100644
--- a/dapl/udapl/dapl_evd_clear_unwaitable.c
+++ b/dapl/udapl/dapl_evd_clear_unwaitable.c
@@ -55,7 +55,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_evd_clear_unwaitable (
 	IN    DAT_EVD_HANDLE	evd_handle )
 {
diff --git a/dapl/udapl/dapl_evd_create.c b/dapl/udapl/dapl_evd_create.c
index f472b39..7687a81 100644
--- a/dapl/udapl/dapl_evd_create.c
+++ b/dapl/udapl/dapl_evd_create.c
@@ -72,7 +72,7 @@
  * even if it is not required. However, it will not be armed.
  */
 
-DAT_RETURN dapl_evd_create (
+DAT_RETURN DAT_API dapl_evd_create (
     IN    DAT_IA_HANDLE		ia_handle,
     IN    DAT_COUNT		evd_min_qlen,
     IN    DAT_CNO_HANDLE	cno_handle,
diff --git a/dapl/udapl/dapl_evd_disable.c b/dapl/udapl/dapl_evd_disable.c
index 64494cf..0187d7f 100644
--- a/dapl/udapl/dapl_evd_disable.c
+++ b/dapl/udapl/dapl_evd_disable.c
@@ -57,7 +57,7 @@
  * 	DAT_INVALID_HANDLE
  */
 
-DAT_RETURN dapl_evd_disable (
+DAT_RETURN DAT_API dapl_evd_disable (
 	IN	DAT_EVD_HANDLE	   evd_handle)
 {
     DAPL_EVD		*evd_ptr;
diff --git a/dapl/udapl/dapl_evd_enable.c b/dapl/udapl/dapl_evd_enable.c
index b9ae03e..6f41eeb 100644
--- a/dapl/udapl/dapl_evd_enable.c
+++ b/dapl/udapl/dapl_evd_enable.c
@@ -58,7 +58,7 @@
  * 	DAT_INVALID_HANDLE
  */
 
-DAT_RETURN dapl_evd_enable (
+DAT_RETURN DAT_API dapl_evd_enable (
 	IN	DAT_EVD_HANDLE	   evd_handle)
 {
     DAPL_EVD		*evd_ptr;
diff --git a/dapl/udapl/dapl_evd_modify_cno.c b/dapl/udapl/dapl_evd_modify_cno.c
index 03cef04..1ee2231 100644
--- a/dapl/udapl/dapl_evd_modify_cno.c
+++ b/dapl/udapl/dapl_evd_modify_cno.c
@@ -59,7 +59,7 @@
  * 	DAT_INVALID_HANDLE
  */
 
-DAT_RETURN dapl_evd_modify_cno (
+DAT_RETURN DAT_API dapl_evd_modify_cno (
 	IN	DAT_EVD_HANDLE		evd_handle,
 	IN	DAT_CNO_HANDLE		cno_handle)
 
diff --git a/dapl/udapl/dapl_evd_query.c b/dapl/udapl/dapl_evd_query.c
index 3aa3b24..6983d23 100644
--- a/dapl/udapl/dapl_evd_query.c
+++ b/dapl/udapl/dapl_evd_query.c
@@ -56,7 +56,7 @@
  * 	DAT_SUCCESS
  * 	DAT_INVALID_PARAMETER
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_evd_query (
 	IN	DAT_EVD_HANDLE		evd_handle,
 	IN	DAT_EVD_PARAM_MASK	evd_param_mask,
diff --git a/dapl/udapl/dapl_evd_set_unwaitable.c b/dapl/udapl/dapl_evd_set_unwaitable.c
index e11b9d8..35250ff 100644
--- a/dapl/udapl/dapl_evd_set_unwaitable.c
+++ b/dapl/udapl/dapl_evd_set_unwaitable.c
@@ -56,7 +56,7 @@
  *	DAT_SUCCESS
  *	DAT_INVALID_HANDLE
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_evd_set_unwaitable (
 	IN    DAT_EVD_HANDLE	evd_handle )
 {
diff --git a/dapl/udapl/dapl_evd_wait.c b/dapl/udapl/dapl_evd_wait.c
index 966cef0..e4e5b37 100644
--- a/dapl/udapl/dapl_evd_wait.c
+++ b/dapl/udapl/dapl_evd_wait.c
@@ -63,7 +63,7 @@
  * 	DAT_INVALID_STATE
  */
 
-DAT_RETURN dapl_evd_wait (
+DAT_RETURN DAT_API dapl_evd_wait (
     IN  DAT_EVD_HANDLE	evd_handle,
     IN  DAT_TIMEOUT	time_out,
     IN  DAT_COUNT       threshold,
diff --git a/dapl/udapl/dapl_init.c b/dapl/udapl/dapl_init.c
index 787261b..cdd90d8 100644
--- a/dapl/udapl/dapl_init.c
+++ b/dapl/udapl/dapl_init.c
@@ -166,7 +166,7 @@ void dapl_fini ( void )
  * <hca name> <port number>
  *
  */
-void 
+void DAT_API
 DAT_PROVIDER_INIT_FUNC_NAME (
     IN const DAT_PROVIDER_INFO 	*provider_info,
     IN const char 		*instance_data )
@@ -261,7 +261,7 @@ DAT_PROVIDER_INIT_FUNC_NAME (
  * This function is called by the registry to de-initialize a provider
  *
  */
-void 
+void DAT_API
 DAT_PROVIDER_FINI_FUNC_NAME (
     IN const DAT_PROVIDER_INFO 	*provider_info )
 {
diff --git a/dapl/udapl/dapl_lmr_create.c b/dapl/udapl/dapl_lmr_create.c
index 2963847..350abe0 100644
--- a/dapl/udapl/dapl_lmr_create.c
+++ b/dapl/udapl/dapl_lmr_create.c
@@ -450,7 +450,7 @@ dapli_lmr_create_shared (
  * 	DAT_MODEL_NOT_SUPPORTED
  *
  */
-DAT_RETURN
+DAT_RETURN DAT_API
 dapl_lmr_create (
 	IN	DAT_IA_HANDLE		ia_handle,
 	IN	DAT_MEM_TYPE		mem_type,




More information about the ofw mailing list