summaryrefslogtreecommitdiffstats
path: root/src/color-profile.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2009-09-27 01:11:50 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2009-09-27 01:11:50 +0000
commitde19afb91dc6dc9094cccfa84c790b7942de46ad (patch)
treeb2dea33939db83f21f58b83ab9879fb63990f763 /src/color-profile.cpp
parentFixed Win32 code for MS Windows-specific color profile location. Fixes bug #2... (diff)
downloadinkscape-de19afb91dc6dc9094cccfa84c790b7942de46ad.tar.gz
inkscape-de19afb91dc6dc9094cccfa84c790b7942de46ad.zip
fix build on win32 with LCMS_ENABLED
(bzr r8655)
Diffstat (limited to 'src/color-profile.cpp')
-rw-r--r--src/color-profile.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 6e180ab4f..37ebc4f30 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -16,13 +16,10 @@
#include <string>
#ifdef WIN32
-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
+#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. Required for correctly including icm.h
#define _WIN32_WINDOWS 0x0410
#endif
-#if ENABLE_LCMS
-#else
#include <windows.h>
-#endif // ENABLE_LCMS
#endif
#include "xml/repr.h"