summaryrefslogtreecommitdiff
path: root/src/helper/replacements.h
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-17 12:55:27 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-10-17 12:55:27 +0000
commiteaea7552ac39bd98fbef401fb25cd58fb8695c34 (patch)
tree7b715824d1e6cb0cd8fa43c655aa96d4579e86dc /src/helper/replacements.h
parent9f989443f7b9400841dbaba99dd42ea10a0f421b (diff)
downloadopenocd+libswd-eaea7552ac39bd98fbef401fb25cd58fb8695c34.tar.gz
openocd+libswd-eaea7552ac39bd98fbef401fb25cd58fb8695c34.tar.bz2
openocd+libswd-eaea7552ac39bd98fbef401fb25cd58fb8695c34.tar.xz
openocd+libswd-eaea7552ac39bd98fbef401fb25cd58fb8695c34.zip
try to get struct timezone def right w.r.t. config.h. Now compiles under Cygwin and eCos
git-svn-id: svn://svn.berlios.de/openocd/trunk@1080 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/replacements.h')
-rw-r--r--src/helper/replacements.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index b1020ac3..9e3fdf8a 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -67,8 +67,7 @@
#define ENOTSUP 134 /* Not supported */
#endif
-/* gettimeofday() */
-#ifndef HAVE_GETTIMEOFDAY
+#ifndef HAVE_SYS_TIME_H
#ifndef _TIMEVAL_DEFINED
#define _TIMEVAL_DEFINED
@@ -77,13 +76,18 @@ struct timeval {
long tv_sec;
long tv_usec;
};
-#endif /* _TIMEVAL_DEFINED */
struct timezone {
int tz_minuteswest;
int tz_dsttime;
};
+#endif /* _TIMEVAL_DEFINED */
+
+#endif
+
+/* gettimeofday() */
+#ifndef HAVE_GETTIMEOFDAY
extern int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif
@@ -106,17 +110,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) */
@@ -139,7 +143,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