Skip to content

Commit d64b28e

Browse files
committed
Revise test condition for strerror_r
1 parent ae04d9c commit d64b28e

2 files changed

Lines changed: 2 additions & 29 deletions

File tree

configure.ac

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,32 +133,6 @@ AC_LINK_IFELSE(
133133
]
134134
)
135135

136-
##############################################################################
137-
### Check XSI strerror_r.
138-
##############################################################################
139-
AC_MSG_CHECKING([for XSI strerror_r])
140-
HOLD_CPPFLAGS="$CPPFLAGS"
141-
CPPFLAGS="$CPPFLAGS -Werror"
142-
AC_LINK_IFELSE(
143-
[AC_LANG_SOURCE([[
144-
#include <string.h>
145-
#include <errno.h>
146-
int main(int argc, char** argv) {
147-
char buf[1024];
148-
int ret = strerror_r(ENOMEM, buf, sizeof(buf));
149-
return ret;
150-
}]])
151-
],[
152-
AC_DEFINE([XSI_STRERROR_R], [1], [Define if you have XSI strerror_r function.])
153-
XSI_STRERROR="yes"
154-
AC_MSG_RESULT([yes])
155-
],[
156-
XSI_STRERROR="no"
157-
AC_MSG_RESULT([no])
158-
]
159-
)
160-
CPPFLAGS="$HOLD_CPPFLAGS"
161-
162136
###############################################################################
163137
### V4L2 Video System - Optional
164138
###############################################################################
@@ -687,7 +661,6 @@ echo "OS : $host_os"
687661
echo "pthread_np : $PTHREAD_NP"
688662
echo "pthread_setname_np : $PTHREAD_SETNAME_NP"
689663
echo "pthread_getname_np : $PTHREAD_GETNAME_NP"
690-
echo "XSI error : $XSI_STRERROR"
691664
echo "V4L2 : $V4L2"
692665
echo "webp : $WEBP$WEBP_VER"
693666
echo "libcamera : $LIBCAM$LIBCAM_VER"

src/logger.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ void cls_log::add_errmsg(int flgerr, int err_save)
147147
}
148148

149149
memset(err_buf, 0, sizeof(err_buf));
150-
#if defined(XSI_STRERROR_R) /* XSI-compliant strerror_r() */
150+
#if not defined(_GNU_SOURCE) /* XSI-compliant strerror_r() */
151151
(void)strerror_r(err_save, err_buf, sizeof(err_buf));
152-
#else/* GNU-specific strerror_r() */
152+
#else /* GNU-specific strerror_r() */
153153
(void)snprintf(err_buf, sizeof(err_buf),"%s"
154154
, strerror_r(err_save, err_buf, sizeof(err_buf)));
155155
#endif

0 commit comments

Comments
 (0)