From 52cb72f02e04786015b2adacd8072bcf2f5e89cb Mon Sep 17 00:00:00 2001 From: Carlos Une Date: Sat, 10 Jul 2021 21:30:35 -0300 Subject: Use C wrapper by default --- src/c.c | 8 -------- src/fpm_filesystem.F90 | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/c.c b/src/c.c index 8cfbd20..c54469a 100644 --- a/src/c.c +++ b/src/c.c @@ -1,9 +1,3 @@ -/* FIXME: fpm --flag '-DENABLE_C_WRAPPER' currently doesn't work with .c files. Use #if..#endif below for the time being. */ -#if ((defined(_WIN32) && (defined(__MINGW32__) || defined(__MINGW64__))) || defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__)) -#define ENABLE_C_WRAPPER -#endif - -#ifdef ENABLE_C_WRAPPER #include #include @@ -18,5 +12,3 @@ const char *get_d_name(struct dirent *d) { return (const char *) d->d_name; } - -#endif diff --git a/src/fpm_filesystem.F90 b/src/fpm_filesystem.F90 index 7d21e31..7b70ebe 100644 --- a/src/fpm_filesystem.F90 +++ b/src/fpm_filesystem.F90 @@ -17,7 +17,7 @@ use,intrinsic :: iso_fortran_env, only : stdin=>input_unit, stdout=>output_unit, integer, parameter :: LINE_BUFFER_LEN = 1000 -#ifdef ENABLE_C_WRAPPER +#ifndef FPM_BOOTSTRAP interface function c_opendir(dir) result(r) bind(c, name="opendir") import c_char, c_ptr @@ -345,7 +345,7 @@ subroutine mkdir(dir) end if end subroutine mkdir -#ifdef ENABLE_C_WRAPPER +#ifndef FPM_BOOTSTRAP !> Get file & directory names in directory `dir` using iso_c_binding. !! !! - File/directory names return are relative to cwd, ie. preprended with `dir` -- cgit v1.2.3