suppress "'rset' is deprecated" for all files except record support where this would cause an error

This commit is contained in:
2018-05-30 11:23:19 +02:00
parent 35a58b0ea2
commit 2d7dcf7403
+13 -3
View File
@@ -313,9 +313,6 @@ TOP:=${EPICS_BASE}
BASE_CPPFLAGS=
EPICS_BASE:=${EB}
COMMON_DIR = O.${EPICSVERSION}_Common
ifndef LEGACY_RSET
USR_CPPFLAGS+=-DUSE_TYPED_RSET
endif
SHRLIB_VERSION=
# do not link *everything* with readline (and curses)
COMMANDLINE_LIBRARY =
@@ -643,6 +640,19 @@ endif
# See ${REGISTRYFILE} and ${EXPORTFILE} rules below.
LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE} ${EXPORTFILE})))
ifdef BASE_3_16
# Suppress "'rset' is deprecated" warning for old drivers
# but not on record types where it would cause an error
ifndef USING_NEW_RSET
SUPPRESS_RSET_WARNING = -DUSE_TYPED_RSET
USR_CPPFLAGS += ${SUPPRESS_RSET_WARNING}
%Record.o: SUPPRESS_RSET_WARNING=
%Record.i: SUPPRESS_RSET_WARNING=
%Record.ii: SUPPRESS_RSET_WARNING=
%Record$(DEP): SUPPRESS_RSET_WARNING=
endif
endif
endif # Both, 3.13 and 3.14 from here.
# For backward compatibility: