EPICS_DLL => EPICS_DLL_NO (so we are backwards compatible

This commit is contained in:
Jeff Hill
1998-06-22 22:32:05 +00:00
parent 3c5875c821
commit 94fdaba021
5 changed files with 13 additions and 7 deletions

View File

@@ -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()

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)