From 109ccd13c8fb5ff97ff6fdc2ed85a67eee7eb0a9 Mon Sep 17 00:00:00 2001 From: Samuel Andersen Date: Mon, 9 Nov 2020 14:58:27 -0800 Subject: [PATCH] Change off64_t patch to match APPLE format in CMakeLists.txt --- CMakeLists.txt | 6 +++++- libgrive/src/util/OS.hh | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d71660..f63c9d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,10 +10,14 @@ message(WARNING "Version to build: ${GRIVE_VERSION}") # common compile options add_definitions( -DVERSION="${GRIVE_VERSION}" ) add_definitions( -D_FILE_OFFSET_BITS=64 -std=c++0x ) -if ( APPLE ) +if ( APPLE OR ) add_definitions( -Doff64_t=off_t ) endif ( APPLE ) +if ( CMAKE_SYSTEM MATCHES "^FreeBSD" ) + add_definitions( -Doff64_t=off_t ) +endif ( CMAKE_SYSTEM MATCHES "^FreeBSD" ) + find_program( HAVE_SYSTEMD systemd PATHS /lib/systemd /usr/lib/systemd diff --git a/libgrive/src/util/OS.hh b/libgrive/src/util/OS.hh index a5f3c98..bd28e30 100644 --- a/libgrive/src/util/OS.hh +++ b/libgrive/src/util/OS.hh @@ -24,10 +24,6 @@ #include -#if defined(__FreeBSD__) -#define off64_t off_t -#endif - namespace gr { class DateTime ;