aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-05-22 11:53:28 +0200
committerSverker Eriksson <[email protected]>2013-05-22 11:53:28 +0200
commit01eb20066918e107811d01f43b97e3925f894dbd (patch)
tree665f0890c28464022040ad6ce9bb045f544fef49 /erts/emulator/sys/win32
parent4bd041e74b5e3e1356a10bb0188aab37521d717a (diff)
parentc746dd9c73f19588712b4d35e3bab96036348d23 (diff)
downloadotp-01eb20066918e107811d01f43b97e3925f894dbd.tar.gz
otp-01eb20066918e107811d01f43b97e3925f894dbd.tar.bz2
otp-01eb20066918e107811d01f43b97e3925f894dbd.zip
Merge branch 'sverk/win64-fixes' into maint
* sverk/win64-fixes: erts: Change some more 'long' to pointer sized int (ErlDrvUInt) erts: Fix crash in nif_SUITE for win64 erts: Fix assert in isdigit for negative characters
Diffstat (limited to 'erts/emulator/sys/win32')
-rw-r--r--erts/emulator/sys/win32/sys_float.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys_float.c b/erts/emulator/sys/win32/sys_float.c
index e2a777d182..0e19746cf5 100644
--- a/erts/emulator/sys/win32/sys_float.c
+++ b/erts/emulator/sys/win32/sys_float.c
@@ -52,7 +52,7 @@ void erts_thread_disable_fpe(void)
int
sys_chars_to_double(char *buf, double *fp)
{
- char *s = buf, *t, *dp;
+ unsigned char *s = buf, *t, *dp;
/* Robert says that something like this is what he really wanted:
* (The [.,] radix test is NOT what Robert wanted - it was added later)
@@ -120,7 +120,7 @@ sys_chars_to_double(char *buf, double *fp)
int
sys_double_to_chars_ext(double fp, char *buffer, size_t buffer_size, size_t decimals)
{
- char *s = buffer;
+ unsigned char *s = buffer;
if (erts_snprintf(buffer, buffer_size, "%.*e", decimals, fp) >= buffer_size)
return -1;