X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.h;h=069519d1a8906f6e027532d05a3f4a9c15598995;hb=a28eaa85f73759bb189a46308642502c9fa5aa4b;hp=71e4c66ca1c11ec2ede038c91b8629c5f73fb71a;hpb=2585fc34200938fb3fa55a450ea37f68012aafa7;p=openocd.git

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 71e4c66ca1..069519d1a8 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.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     *
@@ -54,9 +60,14 @@
 #ifndef MAX
 #define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
-																 
-/* gettimeofday() */
-#ifndef HAVE_GETTIMEOFDAY
+
+/* for systems that do not support ENOTSUP
+ * win32 being one of them */
+#ifndef ENOTSUP
+#define ENOTSUP 134		/* Not supported */
+#endif
+
+#ifndef HAVE_SYS_TIME_H
 
 #ifndef _TIMEVAL_DEFINED
 #define _TIMEVAL_DEFINED
@@ -65,12 +76,22 @@ struct timeval {
 	long tv_sec;
 	long tv_usec;
 };
+
 #endif /* _TIMEVAL_DEFINED */
 
+#endif
+
+/* gettimeofday() */
+#ifndef HAVE_GETTIMEOFDAY
+
+
+#ifdef _WIN32
 struct timezone {
     int tz_minuteswest;
 	int tz_dsttime;
 };
+#endif
+struct timezone;
 
 extern int gettimeofday(struct timeval *tv, struct timezone *tz);
 #endif
@@ -94,17 +115,17 @@ void *fill_malloc(size_t size);
  *
  * We have figured out that there could exist some malloc problems
  * where variables are using without to be initialise. To find this
- * places, use the fill_malloc function. With this function we want 
- * to initialize memory to some known bad state. This is quite easily 
- * spotted in the debugger and will trap to an invalid address. 
+ * places, use the fill_malloc function. With this function we want
+ * to initialize memory to some known bad state. This is quite easily
+ * spotted in the debugger and will trap to an invalid address.
  *
- * clear_malloc can be used if you want to set not initialise 
+ * clear_malloc can be used if you want to set not initialise
  * variable to 0.
  *
  * If you do not want to change the malloc function, to not use one of
  * the following macros. Which is the default way.
  */
- 
+
 /* #define malloc(_a) clear_malloc(_a) */
 /* #define malloc(_a) fill_malloc(_a) */
 
@@ -127,7 +148,7 @@ static __inline unsigned usleep(unsigned int usecs)
 #else
 #if BUILD_ECOSBOARD
 void usleep(int us);
-#else 
+#else
 #error no usleep defined for your platform
 #endif
 #endif