From 4189521d37249565decb53a4ad4de071b5fcacf8 Mon Sep 17 00:00:00 2001
From: Hombre <natureh@free.fr>
Date: Sat, 6 Nov 2010 12:37:57 +0100
Subject: [PATCH] Had to switch include order to solve #typedef conflicts

---
 rtengine/imageio.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc
index 432fafae2..961362e95 100644
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -24,11 +24,6 @@
 #include <tiffio.h>
 #include <stdio.h>
 #include <string.h>
-extern "C" {
-#include "jdatasrc.c"
-#include <jpeglib.h>
-#include <iccjpeg.h>
-}
 #ifdef WIN32
 #include <winsock2.h>
 #else
@@ -36,6 +31,11 @@ extern "C" {
 #endif
 #include <iptcpairs.h>
 #include <libiptcdata/iptc-jpeg.h>
+extern "C" {
+#include "jdatasrc.c"
+#include <jpeglib.h>
+#include <iccjpeg.h>
+}
 
 Glib::ustring safe_locale_to_utf8 (const std::string& src);