[gdal-dev] HAVE_XLOCALE_H -vs- GDAL_HAVE_XLOCALE_H

[Javier Jimenez Shaw]

Hi

I have seen these two macros defined in the code, and maybe there is a
conflict.

in "cmake/template/cpl_config.h.in" it says
/* Define to 1 if you have the <xlocale.h> header file. */
#cmakedefine GDAL_HAVE_XLOCALE_H 1

and "cmake/helpers/configure.cmake"
check_include_file("xlocale.h" GDAL_HAVE_XLOCALE_H)

but in "ogr/ogrsf_frmts/geojson/libjson/json_tokener.c" says
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
#endif

(that is failing in my M1 compilation)

Should it be
#if defined(HAVE_XLOCALE_H) || defined(GDAL_HAVE_XLOCALE_H)
or directly
#ifdef GDAL_HAVE_XLOCALE_H
or something else?

I can do such a PR.

BTW, there are multiple "HAVE_*" macros, why is this one "GDAL_HAVE_*"?

Thanks.
.___ ._ ..._ .. . ._.  .___ .. __ . _. . __..  ... .... ._ .__
Entre dos pensamientos racionales
hay infinitos pensamientos irracionales.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/gdal-dev/attachments/20220406/91c7091e/attachment.html>