mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2025-12-23 23:18:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revise test condition for strerror_r

Browse Source
This commit is contained in:
Mr-Dave
2025-04-25 17:01:23 -06:00
parent ae04d9cd90
commit d64b28e171
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@@ -133,32 +133,6 @@ AC_LINK_IFELSE(
]
)
##############################################################################
### Check XSI strerror_r.
##############################################################################
AC_MSG_CHECKING([for XSI strerror_r])
HOLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Werror"
AC_LINK_IFELSE(
[AC_LANG_SOURCE([[
#include <string.h>
#include <errno.h>
int main(int argc, char** argv) {
char buf[1024];
int ret = strerror_r(ENOMEM, buf, sizeof(buf));
return ret;
}]])
],[
AC_DEFINE([XSI_STRERROR_R], [1], [Define if you have XSI strerror_r function.])
XSI_STRERROR="yes"
AC_MSG_RESULT([yes])
],[
XSI_STRERROR="no"
AC_MSG_RESULT([no])
]
)
CPPFLAGS="$HOLD_CPPFLAGS"
###############################################################################
### V4L2 Video System - Optional
###############################################################################
@@ -687,7 +661,6 @@ echo "OS : $host_os"
echo "pthread_np : $PTHREAD_NP"
echo "pthread_setname_np : $PTHREAD_SETNAME_NP"
echo "pthread_getname_np : $PTHREAD_GETNAME_NP"
echo "XSI error : $XSI_STRERROR"
echo "V4L2 : $V4L2"
echo "webp : $WEBP$WEBP_VER"
echo "libcamera : $LIBCAM$LIBCAM_VER"

4
src/logger.cpp
View File

@@ -147,9 +147,9 @@ void cls_log::add_errmsg(int flgerr, int err_save)
}
memset(err_buf, 0, sizeof(err_buf));
#if defined(XSI_STRERROR_R) /* XSI-compliant strerror_r() */
#if not defined(_GNU_SOURCE) /* XSI-compliant strerror_r() */
(void)strerror_r(err_save, err_buf, sizeof(err_buf));
#else/* GNU-specific strerror_r() */
#else /* GNU-specific strerror_r() */
(void)snprintf(err_buf, sizeof(err_buf),"%s"
, strerror_r(err_save, err_buf, sizeof(err_buf)));
#endif