summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-08-10 20:21:35 +0000
committerdrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-08-10 20:21:35 +0000
commitb499b5cbd2337382142e5d532c370599fa35f865 (patch)
tree36a0ceb5e386b0130fe330915d4bdf6713eb8cfd
parent20e4e77cdf366dedac21ff5670c54291feadfc05 (diff)
downloadopenocd_libswd-b499b5cbd2337382142e5d532c370599fa35f865.tar.gz
openocd_libswd-b499b5cbd2337382142e5d532c370599fa35f865.tar.bz2
openocd_libswd-b499b5cbd2337382142e5d532c370599fa35f865.tar.xz
openocd_libswd-b499b5cbd2337382142e5d532c370599fa35f865.zip
- changed mingw host detection to *-mingw instead of *-*-mingw to work with i586-mingw32msvc-gcc
- add replacements.h to log.h to make sure ERROR is undefined on windows git-svn-id: svn://svn.berlios.de/openocd/trunk@191 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--configure.in4
-rw-r--r--src/helper/log.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 5e7f9094..4bce9a9d 100644
--- a/configure.in
+++ b/configure.in
@@ -87,7 +87,7 @@ AC_ARG_WITH(ftd2xx,
with_ftd2xx=search)
case $host in
- *-*-cygwin*)
+ *-cygwin*)
is_win32=yes
AC_ARG_ENABLE(parport_giveio,
@@ -106,7 +106,7 @@ case $host in
AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.])
;;
- *-*-mingw*)
+ *-mingw*)
is_mingw=yes
is_win32=yes
diff --git a/src/helper/log.h b/src/helper/log.h
index 6988bfcb..6e799ad3 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -20,6 +20,7 @@
#ifndef ERROR_H
#define ERROR_H
+#include "replacements.h"
#include "command.h"
#include <stdarg.h>