diff --git a/configure/CONFIG_ENV b/configure/CONFIG_ENV index 7f633ed11..c20ccc780 100644 --- a/configure/CONFIG_ENV +++ b/configure/CONFIG_ENV @@ -31,6 +31,7 @@ # (see CAref.html in this distribution) EPICS_CA_ADDR_LIST="" EPICS_CA_AUTO_ADDR_LIST=YES +EPICS_CA_NAME_SERVERS="" EPICS_CA_CONN_TMO=30.0 EPICS_CA_REPEATER_PORT=5065 EPICS_CA_SERVER_PORT=5064 diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp index 1aebb2f8d..16573d1bc 100644 --- a/src/ca/CASG.cpp +++ b/src/ca/CASG.cpp @@ -3,14 +3,12 @@ * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ + /* * Author: Jeffrey O. Hill - * hill@luke.lanl.gov - * (505) 665 1831 */ #include @@ -314,6 +312,3 @@ void CASG::operator delete ( void * ) errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked", __FILE__, __LINE__ ); } - - - diff --git a/src/ca/CAref.html b/src/ca/CAref.html index 5f258b158..13e6cc61e 100644 --- a/src/ca/CAref.html +++ b/src/ca/CAref.html @@ -7,7 +7,8 @@