- changed mingw host detection to *-mingw instead of *-*-mingw to work with i586...

- 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

diff --git a/configure.in b/configure.in
index 5e7f9094ee0d033164575c48a2bb35aca092f109..4bce9a9d4d9b24f6e7895198a305865848389573 100644 (file)
--- 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 6988bfcb9921721a385c8a4e5f5beaa48b67b6b8..6e799ad36f933252e5c8f2b6428557595624087f 100644 (file)
--- 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>