BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing "ULL" suffixes. 

These numbers are larger than 32bit, mark them as ULL to avoid compile
failures on 32bit systems.
This commit is contained in:
Uwe Hermann 2013-01-19 22:00:39 +01:00
parent 73365eaed0
commit 5edc02c77c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/asix-sigma/asix-sigma.c
View File

@ -671,7 +671,7 @@ static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
} }
devc->cur_samplerate = samplerate; devc->cur_samplerate = samplerate;
devc->period_ps = 1000000000000 / samplerate; devc->period_ps = 1000000000000ULL / samplerate;
devc->samples_per_event = 16 / devc->num_probes; devc->samples_per_event = 16 / devc->num_probes;
devc->state.state = SIGMA_IDLE; devc->state.state = SIGMA_IDLE;

6
strutil.c
View File

@ -404,11 +404,11 @@ SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
while (*s == ' ') while (*s == ' ')
s++; s++;
if (!strcmp(s, "fs")) if (!strcmp(s, "fs"))
r->q = 1000000000000000L; r->q = 1000000000000000ULL;
else if (!strcmp(s, "ps")) else if (!strcmp(s, "ps"))
r->q = 1000000000000L; r->q = 1000000000000ULL;
else if (!strcmp(s, "ns")) else if (!strcmp(s, "ns"))
r->q = 1000000000L; r->q = 1000000000ULL;
else if (!strcmp(s, "us")) else if (!strcmp(s, "us"))
r->q = 1000000; r->q = 1000000;
else if (!strcmp(s, "ms")) else if (!strcmp(s, "ms"))