Fix dtest to build properly with extensions.

 Modify dat.h dat_event to include event_extension_data[8].
 Extend struct dat_event outside of extension build
 switch to enable non-extended applications to work
 with extended libraries. Otherwise, there is a potential
 for the event callee to write back too much event data
 and exceed callers non-extended event buffer.

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

diff --git a/dat/include/dat/dat.h b/dat/include/dat/dat.h
index a1868c6db6144f9393fdc22cd1c209310838b0d1..7fa543b0d158a5190f430851eac133c6ec5eead9 100755 (executable)
--- a/dat/include/dat/dat.h
+++ b/dat/include/dat/dat.h
@@ -944,9 +944,7 @@ typedef struct dat_event
     DAT_EVENT_NUMBER            event_number;
     DAT_EVD_HANDLE              evd_handle;
     DAT_EVENT_DATA              event_data;
-#ifdef DAT_EXTENSIONS
     DAT_UINT64                  event_extension_data[8];        
-#endif /* DAT_EXTENSIONS */
 } DAT_EVENT;
 
 /* Provider/registration info */

diff --git a/test/dtest/Makefile.am b/test/dtest/Makefile.am
index 9b8f62fa9101d5d41d10b8066b36e5a567a58ef7..ebc77ee242b27c48f6ef9f4b80cc2a48de9b2b79 100755 (executable)
--- a/test/dtest/Makefile.am
+++ b/test/dtest/Makefile.am
@@ -4,6 +4,7 @@ dtest_SOURCES = dtest.c
 if EXT_TYPE_IB
 bin_PROGRAMS += dtestx
 dtestx_SOURCES = dtestx.c
+dtest_CFLAGS = -DDAT_EXTENSIONS
 dtestx_CFLAGS = -DDAT_EXTENSIONS
 dtestx_LDADD = $(srcdir)/../../dat/udat/libdat.la
 endif