summaryrefslogtreecommitdiff
path: root/src/helper/replacements.h
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-25 15:45:17 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-25 15:45:17 +0000
commitd47e1b8f362379d8a2307f49e2b42115a3f40524 (patch)
tree6b3276ca066bf34e165c28a3de71f84dbc98175d /src/helper/replacements.h
parenta96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff)
downloadopenocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.gz
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.bz2
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.xz
openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.zip
- rename log functions to stop conflicts under win32 (wingdi)
git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/replacements.h')
-rw-r--r--src/helper/replacements.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 79a7a1bd..4df76012 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -140,8 +140,6 @@ void usleep(int us);
#include <windows.h>
#include <time.h>
-#undef ERROR
-
#if IS_MINGW == 1
static __inline unsigned char inb(unsigned short int port)
{