Changeset 217 for branches/branch-1.2/zoo-services/utils

Timestamp:

May 31, 2011, 3:30:49 AM (14 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-services/utils/status/makefile.vc (copied) (copied from trunk/zoo-services/utils/status/makefile.vc)
• zoo-services/utils/status/service.c (modified) (2 diffs)

branches/branch-1.2/zoo-services/utils/status/service.c

@@ -24 +24 @@
 
 #include "service.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 extern "C" {
@@ -135 +138 @@
       setMapInMaps(conf,"lenv","status",tmp);
       updateStatus(conf);
+#ifndef WIN32
       sleep(1);
+#else
+      Sleep(1000);
+#endif
       i+=5;
     }