From 50724b0ed9cffd99285210a41156db5658dcc6b0 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 14 May 2010 16:22:57 +0000
Subject: [PATCH] - API: compile fixes for MinGW

svn path=/trunk/boinc/; revision=21522
---
 api/Makefile.mingw | 2 +-
 checkin_notes      | 9 +++++++++
 lib/boinc_win.h    | 6 ++----
 lib/filesys.cpp    | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/api/Makefile.mingw b/api/Makefile.mingw
index b09ffb8072..b2176c3c0b 100644
--- a/api/Makefile.mingw
+++ b/api/Makefile.mingw
@@ -1,6 +1,6 @@
 BOINCDIR = ..
 DEBUG = -D__DEBUG__ -g3
-OBJ  = boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o
+OBJ  = boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o url.o coproc.o
 LINKOBJ  = $(OBJ)
 LDFLAGS = -lwinmm -march=i386
 INCS = -I"$(BOINCDIR)" -I"$(BOINCDIR)/db" -I"$(BOINCDIR)" -I"$(BOINCDIR)/lib" -I"$(BOINCDIR)/api" 
diff --git a/checkin_notes b/checkin_notes
index 56b03df77f..4527ef69c4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3652,3 +3652,12 @@ David  13 May 2010
 
 	clientgui/
 		BOINCTaskBar.cpp
+
+David  14 May 2010
+    - API: compile fixes for MinGW
+
+    lib/
+        boinc_win.h
+        filesys.cpp
+    api/
+        Makefile.mingw
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index 5d20daf279..6e3fa0c05a 100644
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -125,7 +125,7 @@ typedef size_t socklen_t;
 
 #include <commctrl.h>
 #include <raserror.h>
-#if defined(MINGW_WIN32)
+#if defined(__MINGW32__)
 #include <stdint.h>
 #include <imagehlp.h>
 #else
@@ -163,7 +163,7 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
 // C headers
 #include <sys/stat.h>
 #include <sys/types.h>
-#if !defined(MINGW_WIN32)
+#if !defined(__MINGW32__)
 #include <fcntl.h>
 #endif
 #include <malloc.h>
@@ -249,11 +249,9 @@ extern "C" {
 #endif
 void __cdecl _fpreset (void);
 void __cdecl fpreset (void);
-#ifndef MINGW_WIN32
 #define SetClassLongPtr SetClassLong
 #define GCLP_HICON GCL_HICON
 #define GCLP_HICONSM GCL_HICONSM
-#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index 290a6f5fb2..8802a50fe2 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -21,7 +21,7 @@
 #include "stdwx.h"
 #endif
 
-#if defined(MINGW_WIN32)
+#if defined(__MINGW32__)
 #include <fcntl.h>
 #endif