Update from the Windows port and general cleanup/restructure

1 files changed, 16 insertions, 12 deletions

diff --git a/generic/perfos.h b/generic/perfos.h
index 9e5627c..4fef0b6 100644
--- a/generic/perfos.h
+++ b/generic/perfos.h
@@ -34,6 +34,8 @@
 extern "C" {
 #endif
 
+#ifndef _WIN32
+
 #include <stdio.h>
 #include <math.h>
 #include <sys/types.h>
@@ -48,20 +50,22 @@ extern "C" {
     long   total_delay;
     int    actions;
     char   *message;
-  } ChronoRec, *Chrono;
+  } ZnChronoRec, *ZnChrono;
   
   
-  void XStartChrono(Chrono /*chrono*/, Display */*dpy*/, Drawable /*win*/);
-  void XStopChrono(Chrono /*chrono*/, Display */*dpy*/, Drawable /*win*/);
-  void StartChrono(Chrono /*chrono*/);
-  void StopChrono(Chrono /*chrono*/);
-  void StartUCChrono(Chrono /*chrono*/);
-  void StopUCChrono(Chrono /*chrono*/);
-  Chrono NewChrono(char */*message*/);
-  void FreeChrono(Chrono /*chrono*/);
-  void PrintChronos(void);
-  void GetChrono(Chrono /*chrono*/, long */*time*/, int */*actions*/);
-  void ResetChronos(Chrono /*chrono*/);
+  void ZnXStartChrono(ZnChrono /*chrono*/, Display */*dpy*/, Drawable /*win*/);
+  void ZnXStopChrono(ZnChrono /*chrono*/, Display */*dpy*/, Drawable /*win*/);
+  void ZnStartChrono(ZnChrono /*chrono*/);
+  void ZnStopChrono(ZnChrono /*chrono*/);
+  void ZnStartUCChrono(ZnChrono /*chrono*/);
+  void ZnStopUCChrono(ZnChrono /*chrono*/);
+  ZnChrono ZnNewChrono(char */*message*/);
+  void ZnFreeChrono(ZnChrono /*chrono*/);
+  void ZnPrintChronos(void);
+  void ZnGetChrono(ZnChrono /*chrono*/, long */*time*/, int */*actions*/);
+  void ZnResetChronos(ZnChrono /*chrono*/);
+
+#endif /* _WIN32 */
 
 #ifdef __CPLUSPLUS__
 }