From 94fdaba0217eac0cce640cbe14c5a2383a03e1c3 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 22 Jun 1998 22:32:05 +0000
Subject: [PATCH] EPICS_DLL => EPICS_DLL_NO (so we are backwards compatible

---
 src/ca/windows_depen.c              | 8 +++++++-
 src/include/shareLib.h              | 4 ++--
 src/libCom/misc/shareLib.h          | 4 ++--
 src/libCom/os/WIN32/dllmain.cc      | 2 +-
 src/libCom/osi/os/WIN32/dllmain.cpp | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/ca/windows_depen.c b/src/ca/windows_depen.c
index 7b50dce63..8ba3c258d 100644
--- a/src/ca/windows_depen.c
+++ b/src/ca/windows_depen.c
@@ -32,6 +32,9 @@
  *      Modification Log:
  *      -----------------
  * $Log$
+ * Revision 1.39  1998/06/16 00:41:22  jhill
+ * consolodated code here into libCom
+ *
  * Revision 1.38  1998/05/29 00:03:21  jhill
  * allow CA to run systems w/o local interface query capabilities (ie cygwin32)
  *
@@ -70,6 +73,9 @@
  *
  * Revision 1.19  1995/11/29  19:15:42  jhill
  * added $Log$
+ * added Revision 1.39  1998/06/16 00:41:22  jhill
+ * added consolodated code here into libCom
+ * added
  * added Revision 1.38  1998/05/29 00:03:21  jhill
  * added allow CA to run systems w/o local interface query capabilities (ie cygwin32)
  * added
@@ -685,7 +691,7 @@ void epicsShareAPI caDiscoverInterfaces(ELLLIST *pList, SOCKET socket,
 	free(pIfinfoList);
 }
 
-#ifdef EPICS_DLL
+#if !defined(EPICS_DLL_NO)
 
 /*
  * most of the code here was moved to ca_task_initialize and ca_task_exit()
diff --git a/src/include/shareLib.h b/src/include/shareLib.h
index 078ed2c18..d8d3b3f69 100644
--- a/src/include/shareLib.h
+++ b/src/include/shareLib.h
@@ -71,10 +71,10 @@
  * support these MS VisC++ defacto standard keywords???? If not
  * then we should just switch on defined(_MSC_VER) here)
  *
- * Also check for "EPICS_DLL" defined so that we will not use these
+ * Also check for "EPICS_DLL_NO" not defined so that we will not use these
  * keywords if it is an object library build of base under WIN32.
  */
-#if defined(_WIN32) && !defined(__CYGWIN32__) && defined(EPICS_DLL)
+#if (defined(_WIN32) && !defined(EPICS_DLL_NO)) && !defined(__CYGWIN32__) 
 
 #	if defined(epicsExportSharedSymbols)
 #		define epicsShareExtern extern __declspec(dllexport)
diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h
index 078ed2c18..d8d3b3f69 100644
--- a/src/libCom/misc/shareLib.h
+++ b/src/libCom/misc/shareLib.h
@@ -71,10 +71,10 @@
  * support these MS VisC++ defacto standard keywords???? If not
  * then we should just switch on defined(_MSC_VER) here)
  *
- * Also check for "EPICS_DLL" defined so that we will not use these
+ * Also check for "EPICS_DLL_NO" not defined so that we will not use these
  * keywords if it is an object library build of base under WIN32.
  */
-#if defined(_WIN32) && !defined(__CYGWIN32__) && defined(EPICS_DLL)
+#if (defined(_WIN32) && !defined(EPICS_DLL_NO)) && !defined(__CYGWIN32__) 
 
 #	if defined(epicsExportSharedSymbols)
 #		define epicsShareExtern extern __declspec(dllexport)
diff --git a/src/libCom/os/WIN32/dllmain.cc b/src/libCom/os/WIN32/dllmain.cc
index 95beb7d87..510fe22cb 100644
--- a/src/libCom/os/WIN32/dllmain.cc
+++ b/src/libCom/os/WIN32/dllmain.cc
@@ -49,7 +49,7 @@
 extern int init_osi_time ();
 extern int exit_osi_time ();
 
-#ifdef EPICS_DLL
+#if !defined(EPICS_DLL_NO)
 BOOL WINAPI DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
 {
 	switch (dwReason) 
diff --git a/src/libCom/osi/os/WIN32/dllmain.cpp b/src/libCom/osi/os/WIN32/dllmain.cpp
index 95beb7d87..510fe22cb 100644
--- a/src/libCom/osi/os/WIN32/dllmain.cpp
+++ b/src/libCom/osi/os/WIN32/dllmain.cpp
@@ -49,7 +49,7 @@
 extern int init_osi_time ();
 extern int exit_osi_time ();
 
-#ifdef EPICS_DLL
+#if !defined(EPICS_DLL_NO)
 BOOL WINAPI DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
 {
 	switch (dwReason)