Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2492/src/modules/atoms
Modified Files:
mtime.mx xml.mx
Log Message:
propagated changes of Tuesday Nov 27 2007 - Friday Nov 30 2007
from the MonetDB_5-2 branch to the development trunk
Index: xml.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/xml.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- xml.mx 3 Oct 2007 14:00:49 -0000 1.13
+++ xml.mx 30 Nov 2007 12:36:08 -0000 1.14
@@ -113,7 +113,7 @@
typedef str xml;
#ifdef WIN32
-#ifndef LIBURL
+#ifndef LIBXML
#define xml_export extern __declspec(dllimport)
#else
#define xml_export extern __declspec(dllexport)
Index: mtime.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/mtime.mx,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- mtime.mx 29 Oct 2007 20:09:56 -0000 1.100
+++ mtime.mx 30 Nov 2007 12:36:05 -0000 1.101
@@ -1593,13 +1593,14 @@
}
d = &(*ret)->days;
t = &(*ret)->msecs;
+ (*ret)->msecs = 0;
s += date_fromstr(buf, len, &d);
if (s > buf && (*(s) == '@' || *s == ' ' || *s == '-')) {
while (*(++s) == ' ')
;
pos = daytime_fromstr(s, len, &t);
s = pos ? s + pos : buf;
- } else {
+ } else if (!s || *s) {
(*ret)->msecs = daytime_nil;
}
if (s <= buf || (*ret)->days == date_nil || (*ret)->msecs ==
daytime_nil) {
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
