Merge remote-tracking branch 'lp-anj7/expanded-rules' into 7.0
* lp-anj7/expanded-rules: Generate module version files with new RULES_EXPAND facilities Extend RULES_EXPAND to add more features More generator doc updates Document <library>_API = <stem> for Makefiles Convert epicsShareAPI to epicsStdCall in modules/ca Update generator script Modify rules to allow multiple API.h libraries to be built Convert modules/ca to use LIBCA_API instead of epicsShare Try out a representative sample of APIs from multiple libraries Add build rules to generate and install *API.h header files Add script to generate *API.h headers
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* Copyright (c) 2002 The Regents of the University of California, as
|
||||
* Operator of Los Alamos National Laboratory.
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
/*
|
||||
@@ -32,7 +32,6 @@
|
||||
#include "errlog.h"
|
||||
#include "locationException.h"
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
#include "addrList.h"
|
||||
#include "caerr.h" // for ECA_NOSEARCHADDR
|
||||
#include "udpiiu.h"
|
||||
@@ -462,7 +461,7 @@ void udpiiu :: M_repeaterTimerNotify :: repeaterRegistrationMessage ( unsigned a
|
||||
*
|
||||
* register with the repeater
|
||||
*/
|
||||
void epicsShareAPI caRepeaterRegistrationMessage (
|
||||
void epicsStdCall caRepeaterRegistrationMessage (
|
||||
SOCKET sock, unsigned repeaterPort, unsigned attemptNumber )
|
||||
{
|
||||
osiSockAddr saddr;
|
||||
@@ -579,7 +578,7 @@ void epicsShareAPI caRepeaterRegistrationMessage (
|
||||
*
|
||||
* 072392 - problem solved by using SO_REUSEADDR
|
||||
*/
|
||||
void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
|
||||
void epicsStdCall caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
|
||||
{
|
||||
bool installed = false;
|
||||
int status;
|
||||
|
||||
Reference in New Issue
Block a user