[PATCH 7/8] Remove checks for flockfile(), etc. declarations

Sebastian Huber sebastian.huber at embedded-brains.de
Thu Oct 18 13:00:13 UTC 2018


Declarations provided by Newlib since 2002.

Update #3409.
---
 cpukit/configure.ac                   | 5 -----
 cpukit/libcsupport/src/flockfile.c    | 2 +-
 cpukit/libcsupport/src/ftrylockfile.c | 2 +-
 cpukit/libcsupport/src/funlockfile.c  | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index ffc8d51ef4..cb7a0a0479 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -75,11 +75,6 @@ AC_CHECK_FUNCS([creat \
 AC_CHECK_FUNCS([execl execlp execle execv execvp execve])
 AC_CHECK_FUNCS([regcomp regexec regerror regfree])
 
-# Mandated by POSIX, decls not present in some versions of newlib
-AC_CHECK_DECLS([flockfile],[AC_CHECK_FUNCS([flockfile])],,[#include <stdio.h>])
-AC_CHECK_DECLS([funlockfile],[AC_CHECK_FUNCS([funlockfile])],,[#include <stdio.h>])
-AC_CHECK_DECLS([ftrylockfile],[AC_CHECK_FUNCS([ftrylockfile])],,[#include <stdio.h>])
-
 # Newlib proprietary
 AC_CHECK_MEMBER([struct _Thread_queue_Queue._name],[],[RTEMS_TOOL_CHAIN_ERROR],[#include <sys/lock.h>])
 
diff --git a/cpukit/libcsupport/src/flockfile.c b/cpukit/libcsupport/src/flockfile.c
index 511badd219..e924b4e71d 100644
--- a/cpukit/libcsupport/src/flockfile.c
+++ b/cpukit/libcsupport/src/flockfile.c
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#if defined(RTEMS_NEWLIB) && !defined(HAVE_FLOCKFILE) && defined(HAVE_DECL_FLOCKFILE)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_FLOCKFILE)
 
 #include <stdio.h>
 
diff --git a/cpukit/libcsupport/src/ftrylockfile.c b/cpukit/libcsupport/src/ftrylockfile.c
index bc567e49a7..6b62396b74 100644
--- a/cpukit/libcsupport/src/ftrylockfile.c
+++ b/cpukit/libcsupport/src/ftrylockfile.c
@@ -10,7 +10,7 @@
 #include "config.h"
 #endif
 
-#if defined(RTEMS_NEWLIB) && !defined(HAVE_FTRYLOCKFILE) && defined(HAVE_DECL_FTRYLOCKFILE)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_FTRYLOCKFILE)
 
 #include <stdio.h>
 #include <rtems/seterr.h>
diff --git a/cpukit/libcsupport/src/funlockfile.c b/cpukit/libcsupport/src/funlockfile.c
index bf409da8a3..3c1efff7a6 100644
--- a/cpukit/libcsupport/src/funlockfile.c
+++ b/cpukit/libcsupport/src/funlockfile.c
@@ -17,7 +17,7 @@
 #include "config.h"
 #endif
 
-#if defined(RTEMS_NEWLIB) && !defined(HAVE_FUNLOCKFILE) && defined(HAVE_DECL_FUNLOCKFILE)
+#if defined(RTEMS_NEWLIB) && !defined(HAVE_FUNLOCKFILE)
 
 #include <stdio.h>
 
-- 
2.16.4




More information about the devel mailing list