From 75da9fd4542d37d87313dd223340a136d37562a9 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 28 Jul 2014 12:27:02 -0500
Subject: [PATCH] Moved dlopen version of osdFindSymbol.c into posix

It was identical in solaris, Darwin and Linux, and had
not been included for cygwin so this reduces duplication.
---
 src/libCom/osi/os/Linux/osdFindSymbol.c       | 27 -------------------
 .../osi/os/{Darwin => posix}/osdFindSymbol.c  |  2 +-
 src/libCom/osi/os/solaris/osdFindSymbol.c     | 27 -------------------
 3 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 src/libCom/osi/os/Linux/osdFindSymbol.c
 rename src/libCom/osi/os/{Darwin => posix}/osdFindSymbol.c (95%)
 delete mode 100644 src/libCom/osi/os/solaris/osdFindSymbol.c

diff --git a/src/libCom/osi/os/Linux/osdFindSymbol.c b/src/libCom/osi/os/Linux/osdFindSymbol.c
deleted file mode 100644
index 967c220cd..000000000
--- a/src/libCom/osi/os/Linux/osdFindSymbol.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
-*     National Laboratory.
-* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-/* osi/os/default/epicsFindSymbol.c */
-
-#include <dlfcn.h>
-
-#define epicsExportSharedSymbols
-#include "epicsFindSymbol.h"
-
-epicsShareFunc void * epicsLoadLibrary(const char *name)
-{
-    return dlopen(name, RTLD_LAZY | RTLD_GLOBAL);
-}
-
-epicsShareFunc const char *epicsLoadError(void)
-{
-    return dlerror();
-}
-
-epicsShareFunc void * epicsShareAPI epicsFindSymbol(const char *name)
-{
-    return dlsym(0, name);
-}
diff --git a/src/libCom/osi/os/Darwin/osdFindSymbol.c b/src/libCom/osi/os/posix/osdFindSymbol.c
similarity index 95%
rename from src/libCom/osi/os/Darwin/osdFindSymbol.c
rename to src/libCom/osi/os/posix/osdFindSymbol.c
index 967c220cd..fd81f49e3 100644
--- a/src/libCom/osi/os/Darwin/osdFindSymbol.c
+++ b/src/libCom/osi/os/posix/osdFindSymbol.c
@@ -4,7 +4,7 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* osi/os/default/epicsFindSymbol.c */
+/* osi/os/posix/epicsFindSymbol.c */
 
 #include <dlfcn.h>
 
diff --git a/src/libCom/osi/os/solaris/osdFindSymbol.c b/src/libCom/osi/os/solaris/osdFindSymbol.c
deleted file mode 100644
index 967c220cd..000000000
--- a/src/libCom/osi/os/solaris/osdFindSymbol.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
-*     National Laboratory.
-* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-/* osi/os/default/epicsFindSymbol.c */
-
-#include <dlfcn.h>
-
-#define epicsExportSharedSymbols
-#include "epicsFindSymbol.h"
-
-epicsShareFunc void * epicsLoadLibrary(const char *name)
-{
-    return dlopen(name, RTLD_LAZY | RTLD_GLOBAL);
-}
-
-epicsShareFunc const char *epicsLoadError(void)
-{
-    return dlerror();
-}
-
-epicsShareFunc void * epicsShareAPI epicsFindSymbol(const char *name)
-{
-    return dlsym(0, name);
-}