[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=bd4791c

The following commit has been merged in the master branch:
commit bd4791c57a1d25ea8e308c2b5a2e93447030d28e
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Fri May 14 06:11:56 2010 +0000

    use right header file to compile under Mingw32
---
 src/makernote.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index aa48e4d..4a09be8 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -30,12 +30,18 @@ EXIV2_RCSID("@(#) $Id$")
 
 // *****************************************************************************
 // included header files
-#ifdef _MSC_VER
+
+// htonl method (sony_decrypt)
+#ifdef _MSC_VER                    // MSVC case
 # include "exv_msvc.h"
 # include <winsock.h>
 #else
 # include "exv_conf.h"
-# include <arpa/inet.h>           // htonl (sony_decrypt)
+# ifdef WIN32                      // MINGW32 case
+#  include <winsock2.h>
+# else                             // LINUX case
+#  include <arpa/inet.h>
+# endif
 #endif
 
 #include "makernote_int.hpp"

-- 
exiv2 packaging