- str9 driver remove the duplicate target_free_working_area and reformat spaces to...

[openocd.git] / src / helper / replacements.h

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 79a7a1bd1988ae25cb285d72f279d7f9c66103b5..71e4c66ca1c11ec2ede038c91b8629c5f73fb71a 100644 (file)
--- 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)
 {
@@ -189,7 +187,7 @@ static __inline int close_socket(int sock)
 static __inline void socket_nonblock(int fd)
 {
 #ifdef _WIN32
-       long nonblock = 1;
+       unsigned long nonblock = 1;
        ioctlsocket(fd, FIONBIO, &nonblock );
 #else
        int oldopts = fcntl(fd, F_GETFL, 0);