diff --git a/src/ioc/as/asDbLib.c b/src/ioc/as/asDbLib.c index a838444c9..82366c0ae 100644 --- a/src/ioc/as/asDbLib.c +++ b/src/ioc/as/asDbLib.c @@ -15,12 +15,13 @@ #include #include -#include "epicsStdioRedirect.h" -#include "dbDefs.h" +#include "errlog.h" #include "cantProceed.h" #include "epicsThread.h" -#include "errlog.h" +#include "epicsStdioRedirect.h" +#include "dbDefs.h" #include "taskwd.h" +#define epicsExportSharedSymbols #include "alarm.h" #include "caeventmask.h" #include "callback.h" @@ -31,7 +32,6 @@ #include "dbEvent.h" #include "dbCommon.h" #include "recSup.h" -#define epicsExportSharedSymbols #include "asLib.h" #include "asCa.h" #include "asDbLib.h" diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c index a358270f3..70d00a781 100644 --- a/src/ioc/db/dbAccess.c +++ b/src/ioc/db/dbAccess.c @@ -30,6 +30,8 @@ #include "epicsTime.h" #include "alarm.h" #include "ellLib.h" +#include "errMdef.h" +#define epicsExportSharedSymbols #include "dbStaticLib.h" #include "dbBase.h" #include "link.h" @@ -41,8 +43,6 @@ #include "dbCommon.h" #include "dbFldTypes.h" #include "special.h" -#include "errMdef.h" -#define epicsExportSharedSymbols #include "dbAddr.h" #include "callback.h" #include "dbScan.h" diff --git a/src/ioc/db/dbCaTest.c b/src/ioc/db/dbCaTest.c index e4103068a..f0ce5c88a 100644 --- a/src/ioc/db/dbCaTest.c +++ b/src/ioc/db/dbCaTest.c @@ -20,9 +20,11 @@ #include #include +#define epicsExportSharedSymbols #include "dbStaticLib.h" -#include "epicsStdioRedirect.h" #include "link.h" +#undef epicsExportSharedSymbols +#include "epicsStdioRedirect.h" /*definitions needed because of old vs new database access*/ #undef DBR_SHORT #undef DBR_PUT_ACKT diff --git a/src/ioc/db/dbLock.c b/src/ioc/db/dbLock.c index e1cea1581..1c69026b7 100644 --- a/src/ioc/db/dbLock.c +++ b/src/ioc/db/dbLock.c @@ -49,20 +49,19 @@ since this will delay all other threads. #include "epicsStdioRedirect.h" #include "dbDefs.h" -#include "dbBase.h" +#include "epicsPrint.h" +#include "errMdef.h" #include "epicsMutex.h" #include "epicsThread.h" #include "epicsAssert.h" #include "cantProceed.h" #include "ellLib.h" +#define epicsExportSharedSymbols #include "dbBase.h" #include "dbStaticLib.h" #include "dbFldTypes.h" #include "link.h" #include "dbCommon.h" -#include "epicsPrint.h" -#include "errMdef.h" -#define epicsExportSharedSymbols #include "dbAddr.h" #include "dbAccessDefs.h" #include "dbLock.h" diff --git a/src/ioc/db/dbScan.c b/src/ioc/db/dbScan.c index 5a372d6a9..12098b31a 100644 --- a/src/ioc/db/dbScan.c +++ b/src/ioc/db/dbScan.c @@ -34,13 +34,13 @@ #include "cantProceed.h" #include "epicsRingPointer.h" #include "epicsPrint.h" +#define epicsExportSharedSymbols #include "dbBase.h" #include "dbStaticLib.h" #include "dbFldTypes.h" #include "link.h" #include "devSup.h" #include "dbCommon.h" -#define epicsExportSharedSymbols #include "dbAddr.h" #include "callback.h" #include "dbAccessDefs.h" diff --git a/src/ioc/db/dbTest.c b/src/ioc/db/dbTest.c index 32733fe4d..433f3b5f4 100644 --- a/src/ioc/db/dbTest.c +++ b/src/ioc/db/dbTest.c @@ -23,6 +23,8 @@ #include "epicsMutex.h" #include "epicsStdioRedirect.h" #include "ellLib.h" +#include "epicsString.h" +#define epicsExportSharedSymbols #include "dbBase.h" #include "dbStaticLib.h" #include "link.h" @@ -33,8 +35,6 @@ #include "dbCommon.h" #include "special.h" #include "db_field_log.h" -#include "epicsString.h" -#define epicsExportSharedSymbols #include "dbAddr.h" #include "dbLock.h" #include "dbAccessDefs.h" diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c index d9d0bc83f..5596f1a0e 100644 --- a/src/ioc/db/db_access.c +++ b/src/ioc/db/db_access.c @@ -27,16 +27,16 @@ #include "errlog.h" #include "ellLib.h" #include "epicsTime.h" -#include "dbStaticLib.h" -#include "dbBase.h" -#include "dbCommon.h" #include "errMdef.h" -#include "recSup.h" #include "alarm.h" #define db_accessHFORdb_accessC #include "db_access.h" #undef db_accessHFORdb_accessC #define epicsExportSharedSymbols +#include "dbStaticLib.h" +#include "dbBase.h" +#include "dbCommon.h" +#include "recSup.h" #include "dbNotify.h" #include "dbAccessDefs.h" #include "dbEvent.h" diff --git a/src/libCom/as/asLibRoutines.c b/src/libCom/as/asLibRoutines.c index 2a5c0d798..b45920636 100644 --- a/src/libCom/as/asLibRoutines.c +++ b/src/libCom/as/asLibRoutines.c @@ -16,6 +16,7 @@ #include #include +#define epicsExportSharedSymbols #include "epicsStdioRedirect.h" #include "dbDefs.h" #include "epicsThread.h" @@ -26,14 +27,12 @@ #include "freeList.h" #include "macLib.h" #include "postfix.h" - +#include "asLib.h" + static epicsMutexId asLock; #define LOCK epicsMutexMustLock(asLock) #define UNLOCK epicsMutexUnlock(asLock) -#define epicsExportSharedSymbols -#include "asLib.h" - /*following must be global because asCa nneeds it*/ epicsShareDef ASBASE volatile *pasbase=NULL; static ASBASE *pasbasenew=NULL; diff --git a/src/libCom/as/asTrapWrite.c b/src/libCom/as/asTrapWrite.c index 7c2536f93..a447ea95c 100644 --- a/src/libCom/as/asTrapWrite.c +++ b/src/libCom/as/asTrapWrite.c @@ -20,13 +20,14 @@ #include #include +#define epicsExportSharedSymbols #include "ellLib.h" #include "freeList.h" #include "epicsStdioRedirect.h" #include "cantProceed.h" #include "epicsMutex.h" #include "ellLib.h" -#define epicsExportSharedSymbols + #include "asLib.h" #include "asTrapWrite.h" diff --git a/src/libCom/flex/flex.c b/src/libCom/flex/flex.c index c86affb17..f69c9ff7f 100644 --- a/src/libCom/flex/flex.c +++ b/src/libCom/flex/flex.c @@ -51,7 +51,9 @@ static char rcsid[] = #include "flexdef.h" */ +#define epicsExportSharedSymbols #include "epicsStdio.h" +#undef epicsExportSharedSymbols static char flex_version[] = "2.3"; diff --git a/src/libCom/log/Makefile b/src/libCom/log/Makefile index 92e4933f7..5b0f23cea 100644 --- a/src/libCom/log/Makefile +++ b/src/libCom/log/Makefile @@ -19,7 +19,7 @@ iocLogServer_SRCS = iocLogServer.c iocLogServer_LIBS = Com iocLogServer_SYS_LIBS_solaris += socket -iocLogServer_SYS_LIBS_WIN32 += user32 +iocLogServer_SYS_LIBS_WIN32 += user32 ws2_32 SCRIPTS_solaris := S99logServer SCRIPTS_Linux := S99logServer diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile index 9bf92f528..210cb7ec9 100644 --- a/src/libCom/test/Makefile +++ b/src/libCom/test/Makefile @@ -39,6 +39,7 @@ TESTS += epicsEllTest TESTPROD_HOST += epicsErrlogTest epicsErrlogTest_SRCS += epicsErrlogTest.c +epicsErrlogTest_SYS_LIBS_WIN32 = ws2_32 user32 testHarness_SRCS += epicsErrlogTest.c TESTS += epicsErrlogTest diff --git a/src/libCom/test/epicsErrlogTest.c b/src/libCom/test/epicsErrlogTest.c index e1729104e..1851f8e56 100644 --- a/src/libCom/test/epicsErrlogTest.c +++ b/src/libCom/test/epicsErrlogTest.c @@ -403,7 +403,7 @@ static void testLogPrefix(void) { iocLogPrefix(prefixstring); testPrefixLogandCompare(prefixactualmsg[1]); testPrefixLogandCompare(prefixactualmsg[2]); - close(sock); + epicsSocketDestroy(sock); } static void testPrefixLogandCompare( const char* logmessage ) { @@ -439,8 +439,8 @@ static void readFromClient(void *pParam) char recvbuf[1024]; int recvLength; - memset(&recvbuf, 0, 1024); - recvLength = recv(insock, &recvbuf, 1024, 0); + memset(recvbuf, 0, 1024); + recvLength = recv(insock, recvbuf, 1024, 0); if (recvLength > 0) { strcat(prefixmsgbuffer, recvbuf); diff --git a/src/libCom/yacc/antelope.c b/src/libCom/yacc/antelope.c index ba39e61e7..48983b587 100644 --- a/src/libCom/yacc/antelope.c +++ b/src/libCom/yacc/antelope.c @@ -8,7 +8,9 @@ \*************************************************************************/ #include #include "defs.h" +#define epicsExportSharedSymbols #include "epicsStdio.h" +#undef epicsExportSharedSymbols char dflag; char lflag;