merge feature/changesAfter3_0_2; resolve conflicts

exampleLink/src/Makefile

@@ -3,8 +3,13 @@ TOP=..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
 
-DBD += exampleLinkRegister.dbd
+#==================================================
+# Build an IOC support library
+#
+
+DBD += exampleLink.dbd
 
 INC += exampleLink.h
 

exampleLink/src/exampleLink.cpp

@@ -9,13 +9,10 @@
  * @date 2013.08.02
  */
 
+#include <pv/exampleLink.h>
 #include <pv/standardPVField.h>
 #include <pv/convert.h>
 
-#define epicsExportSharedSymbols 
-#include <exampleLink.h>
-
-
 namespace epics { namespace pvDatabase { 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/src/exampleLink.h

@@ -8,15 +8,11 @@
  * @author mrk
  * @date 2013.08.02
  */
-#ifndef EXAMPLELINK_H
-#define EXAMPLELINK_H
+#ifndef EXAMPLEPVADOUBLEARRAYGET_H
+#define EXAMPLEPVADOUBLEARRAYGET_H
 
-#ifdef epicsExportSharedSymbols
-#   define examplelinkEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
-//#include <shareLib.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
@@ -26,14 +22,6 @@
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
-
-#ifdef examplelinkEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef examplelinkEpicsExportSharedSymbols
-#   include <shareLib.h>
-#endif
-
-
 namespace epics { namespace pvDatabase { 
 
 
@@ -102,4 +90,4 @@ private:
 
 }}
 
-#endif  /* EXAMPLELINK_H */
+#endif  /* EXAMPLEPVADOUBLEARRAYGET_H */

exampleLink/src/exampleLinkInclude.dbd

@@ -0,0 +1 @@
+registrar("exampleLinkRegister")

exampleLink/src/exampleLinkRegister.cpp

@@ -27,16 +27,15 @@
 #include <epicsThread.h>
 #include <iocsh.h>
 
+#include <epicsExport.h>
+
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-
-#include <epicsExport.h>
-
-#include <exampleLink.h>
+#include <pv/exampleLink.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
@@ -83,7 +82,4 @@ static void exampleLinkRegister(void)
         iocshRegister(&exampleLinkFuncDef, exampleLinkCallFunc);
     }
 }
-
-extern "C" {
-    epicsExportRegistrar(exampleLinkRegister);
-}
+epicsExportRegistrar(exampleLinkRegister);