summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon.jongsma@collabora.co.uk>2008-09-03 23:14:02 -0500
committerJonathon Jongsma <jonathon.jongsma@collabora.co.uk>2008-09-03 23:14:02 -0500
commit880a5269ec44f82e53f8924a9b074035b6e4b930 (patch)
treefff70f6b8ba428a0534c40f223ef771212465b3c
parent7b7630e4787e58f9234168f82f14bb9d849f5415 (diff)
2008-08-27 Armin Burgmeier <armin@arbur.net>
* MSVC_Net2005/cairomm/cairomm.rc.in: Replaced #include afxres.h by compilation with the freely available Visual Studio Express compiler. Bug #17322. Conflicts: ChangeLog
-rw-r--r--ChangeLog7
-rw-r--r--MSVC_Net2005/cairomm/cairomm.rc.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d572cf..422dfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-27 Armin Burgmeier <armin@arbur.net>
+
+ * MSVC_Net2005/cairomm/cairomm.rc.in: Replaced #include "afxres.h" by
+ #include <windows.h> which does the job equally well, and allows
+ compilation with the freely available Visual Studio Express compiler.
+ Bug #17322.
+
2008-08-13 Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
* configure.in: post-release bump
diff --git a/MSVC_Net2005/cairomm/cairomm.rc.in b/MSVC_Net2005/cairomm/cairomm.rc.in
index 537237f..79c0eee 100644
--- a/MSVC_Net2005/cairomm/cairomm.rc.in
+++ b/MSVC_Net2005/cairomm/cairomm.rc.in
@@ -1,7 +1,7 @@
#define APSTUDIO_READONLY_SYMBOLS
-#include "afxres.h"
+#include <windows.h>
#undef APSTUDIO_READONLY_SYMBOLS