[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=a008623

The following commit has been merged in the master branch:
commit a00862336230fbe7ef72346e23b517d344656a78
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jan 2 12:41:36 2016 +0000

    #1147.  Correction for Cygwin/MinGW build-breaker in r4159.  Don't compile the uid/euid/gid code on any windows build.
---
 src/version.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 0f08938..ca5fb14 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -543,17 +543,6 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
             output(os,keys,"library",*lib);
     }
 
-// #1147
-#ifndef _MSC_VER
-    uid_t uid  = getuid()  ;
-    uid_t euid = geteuid() ;
-    uid_t gid  = getgid()  ;
-
-    output(os,keys,"uid"               , uid           );
-    output(os,keys,"euid"              , euid          );
-    output(os,keys,"gid"               , gid           );
-#endif
-
     output(os,keys,"have_regex"        ,have_regex       );
     output(os,keys,"have_strerror_r"   ,have_strerror_r  );
     output(os,keys,"have_gmtime_r"     ,have_gmtime_r    );
@@ -589,6 +578,13 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
     output(os,keys,"enable_video"      ,enable_video     );
     output(os,keys,"enable_webready"   ,enable_webready  );
 
+// #1147
+#ifndef _WIN32
+    uid_t uid  = getuid()  ; output(os,keys,"uid" ,  uid  );
+    uid_t euid = geteuid() ; output(os,keys,"euid", euid  );
+    uid_t gid  = getgid()  ; output(os,keys,"gid" ,  gid  );
+#endif
+
 #if EXV_HAVE_XMP_TOOLKIT
     const char* name = "xmlns";
 

-- 
exiv2 packaging