Detect sys/mman.h and make it optional

Author: msharov

config.h.in

@@ -154,6 +154,9 @@
 // Define to 1 if you have the <sys/types.h> header file.
 #undef HAVE_SYS_TYPES_H
 
+// Define to 1 if you have the <sys/mman.h> header file.
+#undef HAVE_SYS_MMAN_H
+
 // Define to 1 if you have the <time.h> header file.
 #undef HAVE_TIME_H
 

configure

@@ -56,7 +56,7 @@ seds=[s/#define \(WITHOUT_LIBSTDCPP\) 1/#undef \1/;s/\(NOLIBSTDCPP\)/#\1/]
 # Header files
 HEADERS="assert.h ctype.h errno.h fcntl.h float.h inttypes.h limits.h stdio.h
 locale.h alloca.h signal.h stdarg.h stddef.h sys/stat.h sys/types.h stdint.h
-stdlib.h string.h time.h unistd.h math.h stdlib.h";
+stdlib.h string.h time.h unistd.h math.h stdlib.h sys/mman.h";
 
 # Libraries
 LIBS="supc++ gcc_eh SystemStubs"

fstream.cc

@@ -10,8 +10,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
+#if HAVE_SYS_MMAN_H
+    #include <sys/mman.h>
+#endif
 
 namespace ustl {
 
@@ -224,6 +226,16 @@ int fstream::fcntl (const char* rname, int request, long argument)
     return (rv);
 }
 
+void fstream::set_nonblock (bool v)
+{
+    int curf = max (0, fcntl (FCNTLID (F_GETFL)));
+    if (v) curf |=  O_NONBLOCK;
+    else   curf &= ~O_NONBLOCK;
+    fcntl (FCNTLID (F_SETFL), curf);
+}
+
+#if HAVE_SYS_MMAN_H
+
 /// Memory-maps the file and returns a link to it.
 memlink fstream::mmap (off_t n, off_t offset)
 {
@@ -248,12 +260,6 @@ void fstream::msync (memlink& l)
 	set_and_throw (failbit, "msync");
 }
 
-void fstream::set_nonblock (bool v)
-{
-    int curf = max (0, fcntl (FCNTLID (F_GETFL)));
-    if (v) curf |=  O_NONBLOCK;
-    else   curf &= ~O_NONBLOCK;
-    fcntl (FCNTLID (F_SETFL), curf);
-}
+#endif
 
 } // namespace ustl

fstream.h

@@ -44,10 +44,12 @@ class fstream : public ios_base {
     int			fcntl (const char* rname, int request, long argument = 0);
     inline int		fcntl (const char* rname, int request, int argument)	{ return (fstream::fcntl (rname, request, long(argument))); }
     inline int		fcntl (const char* rname, int request, void* argument)	{ return (fstream::fcntl (rname, request, intptr_t(argument))); }
+    void		set_nonblock (bool v = true);
+#if HAVE_SYS_MMAN_H
     memlink		mmap (off_t n, off_t offset = 0);
     void		munmap (memlink& l);
     void		msync (memlink& l);
-    void		set_nonblock (bool v = true);
+#endif
     inline int		fd (void) const		{ return (m_fd); }
     inline bool		is_open (void) const	{ return (fd() >= 0); }
     inline off_t	tellg (void) const	{ return (pos()); }