From d64b28e1717b1227a92bd9df52870ecddcba26ff Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Fri, 25 Apr 2025 17:01:23 -0600
Subject: [PATCH] Revise test condition for strerror_r

---
 configure.ac   | 27 ---------------------------
 src/logger.cpp |  4 ++--
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index b47357a9..6c2fdf78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
diff --git a/src/logger.cpp b/src/logger.cpp
index 3a4d1166..0b9c0b4d 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -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