Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

[fw/openocd] / src / helper / time_support.h

diff --git a/src/helper/time_support.h b/src/helper/time_support.h
index 05dc91190a2a802c99deab20e51aafe771ca7fee..a8036766fcb303a0b28c3d8bb6820fbb21950975 100644 (file)
--- a/src/helper/time_support.h
+++ b/src/helper/time_support.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,14 +26,22 @@
 #ifndef TIME_SUPPORT_H
 #define TIME_SUPPORT_H
 
-#include <sys/time.h>
-#include <time.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 extern int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
 extern int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
 extern int timeval_add_time(struct timeval *result, int sec, int usec);
 /* gettimeofday() timeval in 64 bit ms */
-extern long long timeval_ms();
+extern long long timeval_ms(void);
 
 typedef struct duration_s
 {
@@ -35,7 +49,7 @@ typedef struct duration_s
        struct timeval duration;
 } duration_t;
 
-extern int duration_start_measure(duration_t *duration);
+extern void duration_start_measure(duration_t *duration);
 extern int duration_stop_measure(duration_t *duration, char **text);
 
 #endif /* TIME_SUPPORT_H */