Changeset 541 for trunk

Timestamp:

07/09/08 00:48:39 (5 months ago)

Author:

krobillard

Message:

Fixes for date! on windows.
Fixed c_string.t to handle last line with no newline.

Location:

trunk/thune

Files:

• context.c (modified) (2 diffs)
• print.c (modified) (1 diff)
• scripts/c_string.t (modified) (1 diff)
• tokenize.c (modified) (1 diff)

trunk/thune/context.c

@@ -147 +147 @@
     AtomRec* end = table + ut->env->atoms.used;
 
-    while( it != end )
-    {
-        dprint( "%4ld %08x %5d %5d %s\n", it - table, it->hash,
+#if __WORDSIZE == 64
+#define OFFINT  "%4ld"
+#else
+#define OFFINT  "%4d"
+#endif
+
+    while( it != end )
+    {
+        dprint( OFFINT " %08x %5d %5d %s\n", it - table, it->hash,
                 it->head, it->chain,
                 names + it->nameIndex );
@@ -158 +164 @@
     while( it != end )
     {
-        dprint( "%4ld %08x %5d %5d none\n", it - table, it->hash,
+        dprint( OFFINT " %08x %5d %5d none\n", it - table, it->hash,
                 it->head, it->chain );
         ++it;

trunk/thune/print.c

@@ -403 +403 @@
 #if defined(_WIN32)
 #if _MSC_VER >= 1400
-    _localtime_s( &st, &tt );
+    localtime_s( &st, &tt );
 #else
     st = *localtime( &tt );

trunk/thune/scripts/c_string.t

@@ -18 +18 @@
     next dup tail prev remove drop   ; Remove first & last bracket
     trim.in
+        dup eol push
     ;dup first eol eq? ift next
     [some[

trunk/thune/tokenize.c

@@ -313 +313 @@
         *pos = it;
 #ifdef _WIN32
+#if _MSC_VER >= 1400
+    return sec + (double) (utc ? _mkgmtime( &tmp ) : mktime( &tmp ));
+#else
     return sec + (double) mktime( &tmp );   // TODO: Handle utc.
+#endif
 #else
     return sec + (double) (utc ? timegm( &tmp ) : mktime( &tmp ));