--- trunk/pgmemcache.c	2006/07/20 09:57:48	3
+++ trunk/pgmemcache.c	2006/07/20 10:09:18	5
@@ -34,6 +34,7 @@
 #include "lib/stringinfo.h"
 #include "utils/datetime.h"
 #include "utils/palloc.h"
+#include "utils/memutils.h"
 
 #include "pgmemcache.h"
 
@@ -470,7 +471,7 @@
       timestamptz = PG_GETARG_TIMESTAMPTZ(2);
 
       /* convert to timestamptz to produce consistent results */
-      if (timestamp2tm(timestamptz, NULL, &tm, &fsec, NULL) !=0)
+      if (timestamp2tm(timestamptz, NULL, &tm, &fsec, NULL, NULL) !=0)
 	ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 			errmsg("timestamp out of range")));
 
@@ -640,8 +641,8 @@
   appendStringInfo(str, "uptime: %llu\n", (uint64)stats->uptime);
   appendStringInfo(str, "time: %llu\n", (uint64)stats->time);
   appendStringInfo(str, "version: %s\n", stats->version);
-  appendStringInfo(str, "rusage_user: %u.%us\n", stats->rusage_user.tv_sec, stats->rusage_user.tv_usec);
-  appendStringInfo(str, "rusage_system: %u.%us\n", stats->rusage_system.tv_sec, stats->rusage_system.tv_usec);
+  appendStringInfo(str, "rusage_user: %u.%us\n", (uint)stats->rusage_user.tv_sec, (uint)stats->rusage_user.tv_usec);
+  appendStringInfo(str, "rusage_system: %u.%us\n", (uint)stats->rusage_system.tv_sec, (uint)stats->rusage_system.tv_usec);
   appendStringInfo(str, "curr_items: %u\n", stats->curr_items);
   appendStringInfo(str, "total_items: %llu\n", stats->total_items);
   appendStringInfo(str, "bytes: %llu\n", stats->bytes);
@@ -699,9 +700,9 @@
   else if (pg_strncasecmp("version", VARDATA(stat), stat_len) == 0)
     appendStringInfo(str, "%s", stats->version);
   else if (pg_strncasecmp("rusage_user", VARDATA(stat), stat_len) == 0)
-    appendStringInfo(str, "%u.%u", stats->rusage_user.tv_sec, stats->rusage_user.tv_usec);
+    appendStringInfo(str, "%u.%u", (uint)stats->rusage_user.tv_sec, (uint)stats->rusage_user.tv_usec);
   else if (pg_strncasecmp("rusage_system", VARDATA(stat), stat_len) == 0)
-    appendStringInfo(str, "%u.%u", stats->rusage_system.tv_sec, stats->rusage_system.tv_usec);
+    appendStringInfo(str, "%u.%u", (uint)stats->rusage_system.tv_sec, (uint)stats->rusage_system.tv_usec);
   else if (pg_strncasecmp("curr_items", VARDATA(stat), stat_len) == 0)
     appendStringInfo(str, "%u", stats->curr_items);
   else if (pg_strncasecmp("total_itmes", VARDATA(stat), stat_len) == 0)