blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

[macOS] no MAP_POPULATE

Browse Source
This commit is contained in:
nick black 2021-12-06 01:41:36 -05:00
parent c99c020a6e
commit 0848edbbe7
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -106,7 +106,7 @@ pkg_check_modules(AVUTIL REQUIRED libavutil>=56.0)
pkg_check_modules(SWSCALE REQUIRED libswscale>=5.0)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND FFMpeg)
elseif(${USE_OIIO})
find_package(OpenImageIO 2.1 REQUIRED)
pkg_check_modules(OPENIMAGEIO REQUIRED OpenImageIO>=2.1)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND OpenImageIO)
endif()
endif()
@ -399,8 +399,8 @@ target_link_directories(notcurses-static
elseif(${USE_OIIO})
target_include_directories(notcurses PUBLIC "${OPENIMAGEIO_INCLUDE_DIRS}")
target_include_directories(notcurses-static PUBLIC "${OPENIMAGEIO_STATIC_INCLUDE_DIRS}")
target_link_libraries(notcurses PRIVATE OpenImageIO)
target_link_libraries(notcurses-static PRIVATE ${OPENIMAGEIO_STATIC_LIBRARY})
target_link_libraries(notcurses PRIVATE "${OPENIMAGEIO_LIBRARIES}")
target_link_libraries(notcurses-static PRIVATE ${OPENIMAGEIO_STATIC_LIBRARIES})
target_link_directories(notcurses PRIVATE ${OPENIMAGEIO_LIBRARY_DIRS})
target_link_directories(notcurses-static PRIVATE ${OPENIMAGEIO_STATIC_LIBRARY_DIRS})
endif()

5
src/man/main.c
View File

@ -111,7 +111,10 @@ map_troff_data(int fd, size_t* len){
}
*len = sbuf.st_size;
unsigned char* buf = mmap(NULL, *len, PROT_READ,
MAP_PRIVATE | MAP_POPULATE, fd, 0);
#ifdef MAP_POPULATE
MAP_POPULATE |
#endif
MAP_PRIVATE, fd, 0);
if(buf == MAP_FAILED){
return NULL;
}