diff --git a/configure/os/CONFIG_SITE.Common.darwin-aarch64 b/configure/os/CONFIG_SITE.Common.darwin-aarch64 index 8d79eb16e..5cbbf3c72 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-aarch64 +++ b/configure/os/CONFIG_SITE.Common.darwin-aarch64 @@ -7,3 +7,5 @@ # arm64 devices: Apple Silicon M1 ARCH_CLASS = arm64 + +CODE_CFLAGS = -mmacosx-version-min=14.0 diff --git a/documentation/Makefile.headers b/documentation/Makefile.headers index d892677e9..a57f87b81 100644 --- a/documentation/Makefile.headers +++ b/documentation/Makefile.headers @@ -13,7 +13,9 @@ libcom_HEADERS += bucketLib libcom_HEADERS += cantProceed libcom_HEADERS += compilerDependencies libcom_HEADERS += cvtFast +libcom_HEADERS += dbDefs libcom_HEADERS += dbmf +libcom_HEADERS += devLib libcom_HEADERS += devLibVME libcom_HEADERS += devLibVMEImpl libcom_HEADERS += ellLib @@ -76,7 +78,6 @@ database_HEADERS += dbServer database_HEADERS += dbState database_HEADERS += dbStaticLib database_HEADERS += dbUnitTest -database_HEADERS += devLib database_HEADERS += devSup database_HEADERS += drvSup database_HEADERS += initHooks diff --git a/modules/ca/src/client/access.cpp b/modules/ca/src/client/access.cpp index 19f62460f..859097676 100644 --- a/modules/ca/src/client/access.cpp +++ b/modules/ca/src/client/access.cpp @@ -956,7 +956,7 @@ const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = { }; //extern "C" -const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = { +const enum dbr_value_class_e dbr_value_class[LAST_BUFFER_TYPE+1] = { dbr_class_string, /* string max size */ dbr_class_int, /* short */ dbr_class_float, /* IEEE Float */ diff --git a/modules/ca/src/client/db_access.h b/modules/ca/src/client/db_access.h index 0fd9c5691..62d693bea 100644 --- a/modules/ca/src/client/db_access.h +++ b/modules/ca/src/client/db_access.h @@ -554,13 +554,13 @@ LIBCA_API extern const unsigned short dbr_value_size[]; #ifndef db_accessHFORdb_accessC /* class for each type's value */ -enum dbr_value_class { +enum dbr_value_class_e { dbr_class_int, dbr_class_float, dbr_class_string, dbr_class_max}; -LIBCA_API extern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1]; +LIBCA_API extern const enum dbr_value_class_e dbr_value_class[LAST_BUFFER_TYPE+1]; /* * ptr to value given a pointer to the structure and the DBR type diff --git a/modules/libcom/RTEMS/epicsNtp.c b/modules/libcom/RTEMS/epicsNtp.c index 2c15d8a38..31d56498c 100644 --- a/modules/libcom/RTEMS/epicsNtp.c +++ b/modules/libcom/RTEMS/epicsNtp.c @@ -2,7 +2,7 @@ * (C) 2014 David Lettier. * http://www.lettier.com/ * SPDX-License-Identifier: BSD-3-Clause -* +* * use of UDP funktions and implement timeout, HPJ 15.12.2025 \*************************************************************************/ @@ -33,7 +33,7 @@ int epicsNtpGetTime(char *ntpIp, struct timespec *now) /* Create an UDP socket, use IP address of given nameserver, set the port number struct sockaddr_in serv_addr; // Server address data structure. - add timout of 2 seconds + add timout of 2 seconds. */ struct sockaddr_in serv_addr = { .sin_family = AF_INET,