From 3e50a508f40b36ef810614c261a1e8440746a2f9 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 8 Nov 1999 21:52:23 +0000 Subject: [PATCH] removed extern from epicsShareDef and moved extern in epicsShareExtern --- src/include/shareLib.h | 9 +++++---- src/libCom/misc/shareLib.h | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/include/shareLib.h b/src/include/shareLib.h index 702553cd7..9a33ce9ec 100644 --- a/src/include/shareLib.h +++ b/src/include/shareLib.h @@ -82,13 +82,13 @@ # define epicsShareClass # define epicsShareFunc # else -# define epicsShareExtern extern __declspec(dllexport) +# define epicsShareExtern __declspec(dllexport) extern # define epicsShareClass __declspec(dllexport) # define epicsShareFunc __declspec(dllexport) # endif # else # if defined(_DLL) /* this indicates that we are being compiled to call a DLL */ -# define epicsShareExtern extern __declspec(dllimport) +# define epicsShareExtern __declspec(dllimport) extern # define epicsShareClass __declspec(dllimport) # define epicsShareFunc __declspec(dllimport) # else @@ -110,9 +110,10 @@ */ # define epicsShareAPIV __cdecl # if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */ -# define epicsShareDef extern +# define epicsShareDef # else -# define epicsShareDef extern __declspec(dllexport) + /* extern here is incompatible with visual C++ */ +# define epicsShareDef __declspec(dllexport) # endif # define READONLY const /* diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h index 702553cd7..9a33ce9ec 100644 --- a/src/libCom/misc/shareLib.h +++ b/src/libCom/misc/shareLib.h @@ -82,13 +82,13 @@ # define epicsShareClass # define epicsShareFunc # else -# define epicsShareExtern extern __declspec(dllexport) +# define epicsShareExtern __declspec(dllexport) extern # define epicsShareClass __declspec(dllexport) # define epicsShareFunc __declspec(dllexport) # endif # else # if defined(_DLL) /* this indicates that we are being compiled to call a DLL */ -# define epicsShareExtern extern __declspec(dllimport) +# define epicsShareExtern __declspec(dllimport) extern # define epicsShareClass __declspec(dllimport) # define epicsShareFunc __declspec(dllimport) # else @@ -110,9 +110,10 @@ */ # define epicsShareAPIV __cdecl # if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */ -# define epicsShareDef extern +# define epicsShareDef # else -# define epicsShareDef extern __declspec(dllexport) + /* extern here is incompatible with visual C++ */ +# define epicsShareDef __declspec(dllexport) # endif # define READONLY const /*