Merge pull request #498 from AllenX2018/fix-issue441
fix issue #441: remove strtod definition in strconv.c
This commit is contained in:
commit
79075d5393
@ -3,9 +3,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#ifdef __MINGW32__
|
|
||||||
#undef __NO_ISOCEXT /* ensure stdlib.h will declare prototypes for mingw own 'strtod' replacement, called '__strtod' */
|
|
||||||
#endif
|
|
||||||
#include "jansson_private.h"
|
#include "jansson_private.h"
|
||||||
#include "strbuffer.h"
|
#include "strbuffer.h"
|
||||||
|
|
||||||
@ -14,10 +11,6 @@
|
|||||||
#include <jansson_private_config.h>
|
#include <jansson_private_config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
|
||||||
#define strtod __strtod
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if JSON_HAVE_LOCALECONV
|
#if JSON_HAVE_LOCALECONV
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user