From b1b42d8e1565196b38efdaeb463d800e8ec57d07 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sat, 2 Jan 2016 12:15:20 +0000 Subject: [PATCH] #1147. Correction to r4159 for linux build breaker (linux doesn't have include uuid/uuid.h) --- src/version.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/version.cpp b/src/version.cpp index 613e35e9..0f08938c 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -33,11 +33,6 @@ EXIV2_RCSID("@(#) $Id$") #include "config.h" -// #1147 -#ifndef _MSC_VER -#include -#endif - #ifndef EXV_USE_SSH #define EXV_USE_SSH 0 #endif @@ -550,14 +545,13 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) // #1147 #ifndef _MSC_VER - uuid_t* p_uid ; - uid_t uid = getuid() ; uuid_string_t s_uid ; p_uid= (uuid_t*) &uid ; uuid_unparse(*p_uid,s_uid); - uid_t eid = geteuid() ; uuid_string_t s_eid ; p_uid= (uuid_t*) &eid ; uuid_unparse(*p_uid,s_eid); - uid_t gid = getgid() ; uuid_string_t s_gid ; p_uid= (uuid_t*) &gid ; uuid_unparse(*p_uid,s_gid); - - output(os,keys,"uid" , s_uid ); - output(os,keys,"euid" , s_eid ); - output(os,keys,"gid" , s_gid ); + 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 );