Index: /branches/windows-client/test/client/sysint/client.c
===================================================================
--- /branches/windows-client/test/client/sysint/client.c	(revision 8635)
+++ /branches/windows-client/test/client/sysint/client.c	(revision 8638)
@@ -481,6 +481,8 @@
     pvfs_dirent_incount = 6;
 
+    /*
     do
     {
+    */
         // call readdir 
         ret = PVFS_sys_readdir(pinode_refn, token, pvfs_dirent_incount,
@@ -501,6 +503,8 @@
         token = resp_readdir->token;
         pvfs_dirent_outcount = resp_readdir->pvfs_dirent_outcount;
+    /*
     } 
     while (pvfs_dirent_outcount == 6);
+    */
 #if 0
 
Index: /branches/windows-client/test/client/sysint/io-test.c
===================================================================
--- /branches/windows-client/test/client/sysint/io-test.c	(revision 7500)
+++ /branches/windows-client/test/client/sysint/io-test.c	(revision 8638)
@@ -7,6 +7,8 @@
 #include <time.h>
 #include "client.h"
+#ifndef WIN32
 #include <sys/time.h>
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <stdlib.h>
@@ -16,4 +18,9 @@
 #include "pvfs2-mgmt.h"
 #include "pvfs2-internal.h"
+
+#ifdef WIN32
+#define snprintf    _snprintf
+#define rindex      strrchr
+#endif
 
 #define DEFAULT_IO_SIZE 8*1024*1024
Index: /branches/windows-client/test/client/sysint/mkdir.c
===================================================================
--- /branches/windows-client/test/client/sysint/mkdir.c	(revision 7471)
+++ /branches/windows-client/test/client/sysint/mkdir.c	(revision 8638)
@@ -6,8 +6,12 @@
 
 #include <client.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 #include <time.h>
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 
Index: /branches/windows-client/test/client/sysint/rename.c
===================================================================
--- /branches/windows-client/test/client/sysint/rename.c	(revision 7471)
+++ /branches/windows-client/test/client/sysint/rename.c	(revision 8638)
@@ -6,5 +6,7 @@
 
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include "client.h"
Index: /branches/windows-client/test/client/sysint/readdir.c
===================================================================
--- /branches/windows-client/test/client/sysint/readdir.c	(revision 7471)
+++ /branches/windows-client/test/client/sysint/readdir.c	(revision 8638)
@@ -6,8 +6,12 @@
 
 #include <client.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 
Index: /branches/windows-client/test/client/sysint/find.c
===================================================================
--- /branches/windows-client/test/client/sysint/find.c	(revision 7500)
+++ /branches/windows-client/test/client/sysint/find.c	(revision 8638)
@@ -9,8 +9,14 @@
 #include <client.h>
 #include <string.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include "pvfs2-util.h"
 #include "pvfs2-internal.h"
+
+#ifdef WIN32
+#define snprintf    _snprintf
+#endif
 
 /* TODO: this can be larger after system interface readdir logic
Index: /branches/windows-client/test/client/sysint/remove.c
===================================================================
--- /branches/windows-client/test/client/sysint/remove.c	(revision 7471)
+++ /branches/windows-client/test/client/sysint/remove.c	(revision 8638)
@@ -6,5 +6,7 @@
 
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 
Index: /branches/windows-client/src/apps/admin/pvfs2-ls.c
===================================================================
--- /branches/windows-client/src/apps/admin/pvfs2-ls.c	(revision 8317)
+++ /branches/windows-client/src/apps/admin/pvfs2-ls.c	(revision 8638)
@@ -11,8 +11,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 #include <time.h>
+#ifndef WIN32
 #include <pwd.h>
 #include <grp.h>
+#endif
 #include <assert.h>
 #include <getopt.h>
@@ -26,4 +30,7 @@
 #endif
 
+#ifdef WIN32
+#define snprintf    _snprintf
+#endif
 
 /* TODO: this can be larger after system interface readdir logic
Index: /branches/windows-client/src/common/misc/extent-utils.c
===================================================================
--- /branches/windows-client/src/common/misc/extent-utils.c	(revision 8633)
+++ /branches/windows-client/src/common/misc/extent-utils.c	(revision 8638)
@@ -69,5 +69,5 @@
             (handle < ext->last+1)); 
     */
-    /* ext->last may be max, 2^64 - 1 */
+    /* ext->last may be max, 2^64 - 1 */    
     return ((handle >= ext->first) &&
             (handle <= ext->last));
Index: /branches/windows-client/src/client/sysint/sys-getattr.sm
===================================================================
--- /branches/windows-client/src/client/sysint/sys-getattr.sm	(revision 8633)
+++ /branches/windows-client/src/client/sysint/sys-getattr.sm	(revision 8638)
@@ -521,6 +521,7 @@
 
     /* TODO: attempting to free this frame causes heap fault.
-       Make a copy 
-    PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op); */
+       Make a copy */
+    PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op);
+    /*
     {
         PINT_sm_msgarray_op *copy = malloc(sizeof(PINT_sm_msgarray_op));
@@ -528,4 +529,5 @@
         PINT_sm_push_frame(smcb, 0, copy);
     }
+    */
 
     return SM_ACTION_COMPLETE;