aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlos Une <brocolis@eml.cc>2021-07-10 21:30:35 -0300
committerCarlos Une <brocolis@eml.cc>2021-07-10 21:30:35 -0300
commit52cb72f02e04786015b2adacd8072bcf2f5e89cb (patch)
tree6a1e548a8e5abdb37986899d8d0c19a332f9d3f1 /src
parentdb869aa38ad7736df9eec5dfb8ac05b4ba45590b (diff)
downloadfpm-52cb72f02e04786015b2adacd8072bcf2f5e89cb.tar.gz
fpm-52cb72f02e04786015b2adacd8072bcf2f5e89cb.zip
Use C wrapper by default
Diffstat (limited to 'src')
-rw-r--r--src/c.c8
-rw-r--r--src/fpm_filesystem.F904
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 <sys/stat.h>
#include <dirent.h>
@@ -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`