diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-07-07 18:46:36 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-07-07 18:46:36 +0200 |
| commit | 2b5b97942016c2f18a0992b934d1b6b460391dac (patch) | |
| tree | 46cffbdad4a652422cc94f6077e3ab3955e6dc0f /src/makefile.vc | |
| parent | 396afc3312243ff4a8e95c3b9398d56c5582e30d (diff) | |
| download | PROJ-2b5b97942016c2f18a0992b934d1b6b460391dac.tar.gz PROJ-2b5b97942016c2f18a0992b934d1b6b460391dac.zip | |
Make pj_init() locale safe and no longer modify locale (#226)
Remove setlocale() use in pj_init_ctx(), and replace uses of atof() &
strtod() by their locale safe variants pj_atof() and pj_strtod().
Proj versions from now advertize #define PJ_LOCALE_SAFE 1 in proj_api.h
and export pj_atof() & pj_strtod()
Diffstat (limited to 'src/makefile.vc')
| -rw-r--r-- | src/makefile.vc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/makefile.vc b/src/makefile.vc index 5e57c716..4a47f045 100644 --- a/src/makefile.vc +++ b/src/makefile.vc @@ -54,7 +54,9 @@ support = \ nad_cvt.obj nad_init.obj nad_intr.obj \ pj_utils.obj pj_gridlist.obj pj_gridinfo.obj \ proj_mdist.obj pj_mutex.obj pj_initcache.obj \ - pj_ctx.obj pj_fileapi.obj pj_log.obj pj_apply_vgridshift.obj + pj_ctx.obj pj_fileapi.obj pj_log.obj pj_apply_vgridshift.obj \ + pj_strtod.obj + geodesic = geodesic.obj LIBOBJ = $(support) $(pseudo) $(azimuthal) $(conic) $(cylinder) $(misc) \ $(geodesic) @@ -68,7 +70,7 @@ GEOD_EXE = geod.exe NAD2BIN_EXE = nad2bin.exe CFLAGS = /nologo -I. -DPROJ_LIB=\"$(PROJ_LIB_DIR)\" \ - -DHAVE_STRERROR=1 $(OPTFLAGS) + -DHAVE_STRERROR=1 -DHAVE_LOCALECONV=1 $(OPTFLAGS) default: all |