Merging changes to support Mac OSX 10.6.6 and Darwin GCC 4.2.x

deanberris · deanberris · commit e13cf78ba499 · 2011-02-16T03:42:01.000+08:00
diff --git a/libs/network/example/http/fileserver.cpp b/libs/network/example/http/fileserver.cpp
@@ -47,7 +47,11 @@ struct file_cache {
         boost::upgrade_lock<boost::shared_mutex> lock(cache_mutex);
         std::string real_filename = doc_root_+path;
         if (regions.find(real_filename) != regions.end()) return true;
+#ifdef O_NOATIME
         int fd = open(real_filename.c_str(), O_RDONLY|O_NOATIME|O_NONBLOCK);
+#else
+        int fd = open(real_filename.c_str(), O_RDONLY|O_NONBLOCK);
+#endif
         if (fd == -1) return false;
         std::size_t size = lseek(fd, 0, SEEK_END);
         void * region = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
