summaryrefslogtreecommitdiff
path: root/source3/lib/time.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-20 22:17:16 +0100
committerVolker Lendecke <vl@samba.org>2007-12-21 09:58:20 +0100
commitaddf598cde41d17ad4cf497a64b9a2b27e4028c5 (patch)
tree11b020444f0728e1745e2e2af29b81b55d8fc467 /source3/lib/time.c
parenteeb92cedde4bc45603be4fdcf2f53dd2cc29f1d0 (diff)
downloadsamba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.tar.gz
samba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.tar.bz2
samba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.zip
Some C++ warnings
(This used to be commit 5ab82d4f574f2a2e2761e9e414c66a70aeffb05d)
Diffstat (limited to 'source3/lib/time.c')
-rw-r--r--source3/lib/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 5301e3a55a..f98e03197f 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -1382,7 +1382,7 @@ void unix_to_nt_time_abs(NTTIME *nt, time_t t)
d = (double)(t);
d *= 1.0e7;
- *nt = d;
+ *nt = (NTTIME)d;
/* convert to a negative value */
*nt=~*nt;
@@ -1443,7 +1443,7 @@ const char *display_time(NTTIME nttime)
low = ~(nttime & 0xFFFFFFFF);
low = low/(1000*1000*10);
- sec=high+low;
+ sec=(int)(high+low);
days=sec/(60*60*24);
hours=(sec - (days*60*60*24)) / (60*60);