From 4d0d509129e5f80c4a9efe4523fc4b0aea58622b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 31 Aug 2020 08:36:38 +1000 Subject: [PATCH] meson.build: define PATH_MAX where it's missing PATH_MAX is not POSIX and can be missing on some systems, notably Windows (which provides MAX_PATH instead tough) and Hurd. Let's define it to a sane value where missing, i.e. the one it's defined to in limits.h. Except on Windows where we're limited to 260. Fixes https://github.com/xkbcommon/libxkbcommon/issues/180 Signed-off-by: Peter Hutterer --- meson.build | 8 ++++++++ tools/tools-common.c | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index fcfb3eb..e9233b4 100644 --- a/meson.build +++ b/meson.build @@ -124,6 +124,14 @@ else endif have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE') +if not cc.has_header_symbol('limits.h', 'PATH_MAX', prefix: system_ext_define) + if host_machine.system() == 'windows' + # see https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#maximum-path-length-limitation + configh_data.set('PATH_MAX', 260) + else + configh_data.set('PATH_MAX', 4096) + endif +endif # Silence some security & deprecation warnings on MSVC # for some unix/C functions we use. diff --git a/tools/tools-common.c b/tools/tools-common.c index 0c1ffb9..254499d 100644 --- a/tools/tools-common.c +++ b/tools/tools-common.c @@ -42,9 +42,6 @@ #ifdef _MSC_VER #include #include -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif #else #include #include -- 2.7.4