Move headers checks features/sfio to configure.ac

Some headers required new checks, for some headers, checks were already
present in configure.ac

diff --git a/configure.ac b/configure.ac
index f8cdb55f9e2eadd53f764d1b9cff06e0075445fa..4973b3cdd28a9a9f5fea45c757663215054d574c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -419,9 +419,9 @@ dnl Checks for header files
 # AC_HEADER_STDC
 AC_CHECK_HEADERS(malloc.h \
        fcntl.h search.h termios.h \
-       unistd.h strings.h stat.h \
+       unistd.h strings.h stat.h vfork.h \
        sys/time.h sys/types.h sys/select.h \
-       sys/stat.h sys/mman.h \
+       sys/stat.h sys/mman.h sys/vfork.h \
        sys/ioctl.h sys/inotify.h crt_externs.h)
 AC_HEADER_TIME
 AC_HEADER_DIRENT

diff --git a/lib/sfio/features/sfio b/lib/sfio/features/sfio
index 23d0b865accac2c1d1cc8e323dc61732f19a6a48..60a08e3a7b24832b24abd4538cde80763ec038ae 100644 (file)
--- a/lib/sfio/features/sfio
+++ b/lib/sfio/features/sfio
@@ -6,8 +6,6 @@
 # Converted to sfio v10/01/94 by Giampiero Sierra (06/08/95).
 ##################################################################
 
-hdr unistd
-
 lib ftruncate
 
 lib lseek64
@@ -65,15 +63,12 @@ hdr stat note{ stat() in default lib(s) }end link{
 # vfork and any associated header files
 ##################################################
 
-hdr vfork
-sys vfork
 lib vfork
 
 ##################################################
 # file control checks
 ##################################################
 
-sys ioctl
 lib remove
 lib unlink
 lib waitpid

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 36b5375ddfa518cf54dc7ac2c41202c4c356c638..49244a1259c139a6a6fcd4d5af39e1060169ce67 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -29,6 +29,7 @@ extern "C" {
 
 #include       "FEATURE/sfio"
 #include       "sfio_t.h"
+#include       "config.h"
 
 #include       <vthread.h>
 
@@ -54,10 +55,10 @@ extern "C" {
 #undef  _lib_poll
 #undef  _stream_peek
 #undef  _socket_peek
-#undef  _hdr_vfork
-#undef  _sys_vfork
+#undef  HAVE_VFORK_H
+#undef  _HAVE_SYS_VFORK_H
 #undef  _lib_vfork
-#undef  _sys_ioctl
+#undef  HAVE_SYS_IOCTL_H
 #endif
 
 #include       <stdlib.h>
@@ -82,7 +83,7 @@ extern "C" {
 
 #include       <fcntl.h>
 
-#if _hdr_unistd
+#if HAVE_UNISTD_H
 #include       <unistd.h>
 #endif
 
@@ -138,10 +139,10 @@ extern "C" {
 
 /* alternative process forking */
 #if _lib_vfork && !defined(fork) && !defined(sparc) && !defined(__sparc)
-#if defined(_hdr_vfork)
+#if defined(HAVE_VFORK_H)
 #include       <vfork.h>
 #endif
-#if defined(_sys_vfork)
+#if defined(_HAVE_SYS_VFORK_H)
 #include       <sys/vfork.h>
 #endif
 #define fork   vfork
@@ -799,7 +800,7 @@ extern "C" {
 #include <io.h>
 #define SF_ERROR       0000400 /* an error happened                    */
 #else
-#if !_hdr_unistd
+#if !HAVE_UNISTD_H
     extern int close(int);
     extern ssize_t read(int, void *, size_t);
     extern ssize_t write(int, const void *, size_t);
@@ -819,7 +820,7 @@ extern "C" {
     extern int unlink(const char *);
 #endif
 
-#endif /*_hdr_unistd*/
+#endif /*HAVE_UNISTD_H*/
 #endif /* WIN32 */
 
     extern time_t time(time_t *);
@@ -834,7 +835,7 @@ extern "C" {
     extern int fstat(int, Stat_t *);
 #endif
 
-#if _lib_vfork && !defined(_hdr_vfork) && !defined(_sys_vfork)
+#if _lib_vfork && !defined(HAVE_VFORK_H) && !defined(_HAVE_SYS_VFORK_H)
     extern pid_t vfork(void);
 #endif /*_lib_vfork*/
 

diff --git a/lib/sfio/sfpkrd.c b/lib/sfio/sfpkrd.c
index 37273e4e3aa77259476b628c5a821c2919c7bc64..8331f6daa242224cda2e5425daccf6b4c2e690b0 100644 (file)
--- a/lib/sfio/sfpkrd.c
+++ b/lib/sfio/sfpkrd.c
@@ -13,7 +13,7 @@
 
 #include       "sfhdr.h"
 #ifndef FIONREAD
-#if _sys_ioctl
+#if HAVE_SYS_IOCTL_H
 #include       <sys/ioctl.h>
 #endif
 #endif